Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update patches from Chromium 76.0.3809.100 to Chromium 77.0.3865.19 #3120

Closed
wants to merge 36 commits into from
Closed
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
0c70e73
Update patches from Chromium 76.0.3809.87 to Chromium 77.0.3865.19
mkarolin Jul 24, 2019
7150429
Process version shouldn't create a source set.
mkarolin Jul 24, 2019
136e1fe
Updated chrome_constants override with the changes in the original.
mkarolin Jul 25, 2019
626b41b
OmniboxInputType::INVALID was renamed to EMPTY.
mkarolin Jul 25, 2019
e01a9a4
Updated HandleExternalProtocol signature in BraveContentBrowserClient.
mkarolin Jul 31, 2019
2fc72e6
Updated signature of BraveExtensionsAPIClient::ShouldHideBrowserNetwo…
mkarolin Jul 31, 2019
0cdc1d1
AddRestoredTab now takes a tab group param.
mkarolin Jul 31, 2019
e3aa8cb
content/public interfaces are no longer const.
mkarolin Jul 31, 2019
d2b9de6
.idl files aren't allowed in GN sources.
mkarolin Aug 2, 2019
39124f5
Readded code to get top document GURL in NavigationRequest.
mkarolin Aug 2, 2019
d44f660
Moved start of Brave services to BraveBrowserMainExtraParts::PreMainM…
mkarolin Aug 2, 2019
b4c034f
PrefProvider::is_incognito_ was renamed to off_the_record_.
mkarolin Aug 2, 2019
9b43132
APISignature::ParseArgumentsToJSON signature change.
mkarolin Aug 5, 2019
a5b40a3
ComponentLoader ctor signature change.
mkarolin Aug 5, 2019
4815dfe
SimplifyHttpsIndicator feature is now on by default.
mkarolin Aug 5, 2019
1ae164e
Removed Win10 specific welcome UI flow.
mkarolin Aug 6, 2019
0029eb0
Signin restructure.
mkarolin Aug 6, 2019
bd8a2d1
Use base::Contains instead of ContainsKey.
mkarolin Aug 6, 2019
e1b3b7c
IOThread class has been removed.
mkarolin Aug 6, 2019
6b73802
Fixes compilation of brave_actions_container.h
mkarolin Aug 6, 2019
bb83a37
views::BoxLayout orientation is now a class enum.
mkarolin Aug 6, 2019
3c16cc8
BookmarkNode::set_type was removed.
mkarolin Aug 5, 2019
31d0175
Fixes RenderViewContextMenu override compilation.
mkarolin Aug 6, 2019
0e0f4c8
BookmarkChangeProcessor overrides now use size_t.
mkarolin Aug 6, 2019
a2c56a3
TreeNode::GetChild and child_count were removed.
mkarolin Aug 7, 2019
5fe1e32
Enable networking service.
mkarolin Aug 10, 2019
c7653af
Fixes location change of md_select_css.html.
mkarolin Aug 13, 2019
3cc1f42
Unit tests: Fixes MCSClient API signature changes.
mkarolin Aug 12, 2019
5898235
GridLayout::AddView now takes unique_ptr.
mkarolin Aug 13, 2019
762a6a3
GridLayout c'tor signature change.
mkarolin Aug 13, 2019
96a4bf5
Update strings for 77.0.3865.19.
mkarolin Jul 25, 2019
6ce7fa0
Unit tests: fixes GCMDriver c'tor signature change.
mkarolin Aug 12, 2019
eb8c743
Unit tests: Fixes CreateProfileAsyncHelper signature.
mkarolin Aug 12, 2019
9185b40
TEMPORARY: bookmarks workaround. #2010 Pending.
mkarolin Aug 9, 2019
f3a7ed8
TEMPORARY: network delegate workaround. #2988 Pending.
mkarolin Aug 9, 2019
0bf3cec
TEMPORARY: cookies workaround. #3130 Pending.
mkarolin Aug 10, 2019
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

@@ -285,6 +285,7 @@ process_version("generate_version") {
template_file = "version.version"
extra_args = [ "-e", "BRAVE_BROWSER_VERSION=\"$brave_version\"" ]
output = "$root_out_dir/version"
process_only = true
}

if (!is_android && !is_ios) {
@@ -49,8 +49,8 @@
<message name="IDS_APP_MANAGEMENT_PERMISSIONS" desc="Label for permissions section in the app settings page.">
Permissions
</message>
<message name="IDS_APP_MANAGEMENT_MORE_PERMISSIONS" desc="Label for a link to more permissions for an app.">
More permissions
<message name="IDS_APP_MANAGEMENT_MORE_SETTINGS" desc="Label for a link to more settings and permissions for an app.">
More settings and permissions
</message>
<message name="IDS_APP_MANAGEMENT_THIS_APP_CAN" desc="Label for permissions that a Brave app can use.">
This app can:
@@ -76,4 +76,13 @@
<message name="IDS_APP_MANAGEMENT_VERSION" desc="Label for version of an app in the app settings page.">
Version: <ph name="VERSION">$1<ex>4.0</ex></ph>
</message>
<message name="IDS_APP_MANAGEMENT_PIN_ENFORCED_BY_POLICY" desc="Short text for the pin/unpin context menu to tell user the setting is enforced by policy of an app.">
Pinned by administrator
</message>
<message name="IDS_APP_MANAGEMENT_CONTACTS" desc="Label for the Android contacts (address book) permission toggle.">
Contacts
</message>
<message name="IDS_APP_MANAGEMENT_STORAGE" desc="Label for the Android storage permission toggle.">
Storage
</message>
</grit-part>
@@ -159,7 +159,6 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
// Disabled features.
const std::unordered_set<const char*> disabled_features = {
autofill::features::kAutofillServerCommunication.name,
network::features::kNetworkService.name,
unified_consent::kUnifiedConsent.name,
};
command_line.AppendFeatures(enabled_features, disabled_features);
@@ -589,7 +589,10 @@ Brave is unable to recover your settings.
</message>
</if>
<if expr="chromeos">
<message name="IDS_ABOUT" desc="The text label of the About Brave OS menu item">
<message name="IDS_ABOUT" desc="The text label of the About Brave menu item">
About &amp;Brave
</message>
<message name="IDS_ABOUT_OS" desc="The text label of the About Brave OS menu item">
About &amp;Brave OS
</message>
<message name="IDS_UPDATE_NOW" desc="The text label of the Update Brave OS Now menu item">
@@ -615,9 +618,6 @@ Brave is unable to recover your settings.
</message>

<!-- DICE sign-in promo strings -->
<message name="IDS_PROFILES_DICE_SIGNIN_PROMO" desc="Text describing the benefits of signing in and turning on Sync.">
Sign in to sync and personalize Brave across your devices
</message>
<message name="IDS_PROFILES_DICE_SYNC_PROMO" desc="Text describing the benefits of turning on Sync.">
Sync and personalize Brave across your devices
</message>
@@ -737,6 +737,12 @@ Signing in anyway will merge Brave information like bookmarks, history, and othe
Brave OS could not sync your data due to an error signing in.
</message>
</if>
<message name="IDS_SYNC_PAUSED_REASON_CLEAR_COOKIES_ON_EXIT" desc="Info text displayed in the user menu when sync is paused due to cookies cleared on exit.">
You clear cookies when you quit Brave. To keep syncing, change this <ph name="COOKIE_SETTINGS_LINK">$1<ex>settings</ex></ph>.
</message>
<message name="IDS_SYNC_PAUSED_REASON_CLEAR_COOKIES_ON_EXIT_LINK_TEXT" desc="Link text part of the sync paused info text when sync is paused due to cookies cleared on exit.">
settings
</message>

<if expr="is_android">
<message name="IDS_AUTOFILL_DESCRIBE_LOCAL_COPY" desc="Text label that described a Wallet credit card which has been copied to the local Brave instance.">
@@ -1149,40 +1155,6 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
<message name="IDS_WELCOME_HEADER" desc="A message which will appear as the header on the Welcome UI if the user has never run Brave before.">
Welcome to Brave
</message>
<message name="IDS_WELCOME_HEADER_AFTER_FIRST_RUN" desc="A message which will appear as the header on the Welcome UI if the user has run Brave before.">
Take Brave everywhere
</message>
<message name="IDS_DICE_WELCOME_SECOND_HEADER" desc="A second message which will appear as the header on the Welcome UI if the user has never run Brave before.">
Web browsing with Brave smarts
</message>
<message name="IDS_DICE_WELCOME_DECLINE_BUTTON" desc="A button on the welcome page which declines the offer to sign in to Brave.">
Not now
</message>
<message name="IDS_DICE_WELCOME_DESCRIPTION" desc="A message on the welcome page explaining the purpose of signing in.">
Sync and personalize Brave across your devices
</message>
</if>

<!-- Windows 10 Welcome page strings -->
<if expr="is_win">
<message name="IDS_WIN10_WELCOME_HEADER" desc="A header on the Windows 10 Welcome UI if the user has never run Brave before.">
Welcome to Brave
</message>
<message name="IDS_WIN10_WELCOME_HEADER_AFTER_FIRST_RUN" desc="A header on the Windows 10 Welcome UI if the user has run Brave before.">
Get to Brave faster
</message>
<message name="IDS_WIN10_WELCOME_MAKE_DEFAULT_SUBHEADING" desc="A subheading on a section which gives instructions on how to make Brave the default browser.">
Make Brave your default browser
</message>
<message name="IDS_WIN10_WELCOME_PIN_SUBHEADING" desc="A subheading on a section which gives instructions on how to pin Brave to the Windows 10 taskbar.">
Pin Brave to your taskbar
</message>
<message name="IDS_WIN10_WELCOME_SELECT" desc="An instruction asking the user to select Brave from an external list of apps.">
Select <ph name="SMALL_PRODUCT_LOGO">&lt;div class="logo-small"&gt;&lt;/div&gt;</ph> <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>Brave<ph name="END_BOLD">&lt;/strong&gt;</ph>
</message>
<message name="IDS_WIN10_WELCOME_CLICK_SWITCH_ANYWAY" desc="An instruction asking the user to click on the &quot;Switch anyway&quot; button. It's possible that the button doesn't appear for the user, hence the &quot;if it appears&quot;. The bold portion of this message must match IDS_WIN10_WELCOME_SWITCH_ANYWAY_LABEL.">
Click <ph name="BEGIN_BOLD">&lt;strong&gt;</ph>Switch anyway<ph name="END_BOLD">&lt;/strong&gt;</ph>, if it appears
</message>
</if>

<!-- Native notifications for Windows 10 -->
@@ -1247,6 +1219,12 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
<message name="IDS_DESKTOP_MEDIA_PICKER_TITLE_WEB_CONTENTS_ONLY" desc="Title for the window picker dialog shown when desktop capture of a tab is requested by an app.">
Share a Brave tab
</message>
<!-- User happiness tracking survey UI -->
<if expr="not is_android">
<message name="IDS_HATS_BUBBLE_TITLE" translateable="false" desc="The title of Happiness Tracking Survey's invitation banner, it invites users to take a survey">
Help us improve Brave
</message>
</if>
</messages>
</release>
</grit>
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.