Skip to content

Commit

Permalink
Merge pull request #4009 from brave/78.0.3904.108
Browse files Browse the repository at this point in the history
Upgrade patches from Chromium 78.0.3904.97 to Chromium 78.0.3904.108
  • Loading branch information
bsclifton authored and mkarolin committed Nov 19, 2019
1 parent 13355b0 commit 56bb6a4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
6 changes: 6 additions & 0 deletions app/generated_resources.grd
Original file line number Diff line number Diff line change
Expand Up @@ -5935,6 +5935,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_TAB_CXMENU_CLOSETAB" desc="The label of the tab context menu item for closing one or more tabs.">
Close
</message>
<message name="IDS_TAB_CXMENU_CLOSEOTHERTABS" desc="The label of the 'Close Other Tabs' Tab context menu item.">
Close other tabs
</message>
<message name="IDS_TAB_CXMENU_CLOSETABSTORIGHT" desc="The label of the 'Close Tabs to the Right' Tab context menu item.">
Close tabs to the right
</message>
Expand Down Expand Up @@ -5979,6 +5982,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_TAB_CXMENU_CLOSETAB" desc="In Title Case: The label of the tab context menu item for closing one or more tabs.">
Close
</message>
<message name="IDS_TAB_CXMENU_CLOSEOTHERTABS" desc="In Title Case: The label of the 'Close Other Tabs' Tab context menu item.">
Close Other Tabs
</message>
<message name="IDS_TAB_CXMENU_CLOSETABSTORIGHT" desc="In Title Case: The label of the 'Close Tabs to the Right' Tab context menu item.">
Close Tabs to the Right
</message>
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index 628bbf0d999e7b263af28d18afdcaa8cdc67fefd..546dd103ce4c4f732367600b2e9373e13e996521 100644
index 177739cfcedccfa03e317b6863f3466070a427b7..7262a5d9998a8c7711295d03833c35a23431c7f4 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=78
-MINOR=0
-BUILD=3904
-PATCH=97
-PATCH=108
+MINOR=1
+BUILD=1
+PATCH=4
6 changes: 3 additions & 3 deletions patches/content-browser-storage_partition_impl.cc.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
index c626801963afa375d2c9c971b5d48afb3e269c29..0913f037b048007dd3ead6e28075f925e0e0ba54 100644
index 48f6bd6beddf406c66b31d9fca65fd2f6f4100fc..4c9b957e03f6db72187f57ce763b13b88c853587 100644
--- a/content/browser/storage_partition_impl.cc
+++ b/content/browser/storage_partition_impl.cc
@@ -1705,6 +1705,7 @@ void StoragePartitionImpl::OnCanSendReportingReports(
@@ -1708,6 +1708,7 @@ void StoragePartitionImpl::OnCanSendReportingReports(
bool allowed = permission_controller->GetPermissionStatus(
PermissionType::BACKGROUND_SYNC, origin_url,
origin_url) == blink::mojom::PermissionStatus::GRANTED;
+ allowed = false; // feature disabled in Brave
if (allowed)
origins_out.push_back(origin);
}
@@ -1718,7 +1719,7 @@ void StoragePartitionImpl::OnCanSendDomainReliabilityUpload(
@@ -1721,7 +1722,7 @@ void StoragePartitionImpl::OnCanSendDomainReliabilityUpload(
DCHECK(initialized_);
PermissionController* permission_controller =
BrowserContext::GetPermissionController(browser_context_);
Expand Down

0 comments on commit 56bb6a4

Please sign in to comment.