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.

Sign up for GitHub

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

(0.66.x) Upgrade from Chromium 74.0.3729.131 to Chromium 75.0.3770.38 #2452

Merged
merged 3 commits into from
May 19, 2019
Merged

(0.66.x) Upgrade from Chromium 74.0.3729.131 to Chromium 75.0.3770.38 #2452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8c9c12
Merge pull request #2401 from brave/75.0.3770.27
bsclifton May 15, 2019
6d5a1ba
Removed include which was causing a circular dependency when building
bsclifton May 16, 2019
9985e4b
Upgrade patches from Chromium "75.0.3770.27" to Chromium 75.0.3770.38
brave-browser-releases May 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ deps = {
"vendor/bat-native-tweetnacl": "https://github.com/brave-intl/bat-native-tweetnacl.git@1b4362968c8f22720bfb75af6f506d4ecc0f3116",
"components/brave_sync/extension/brave-sync": "https://github.com/brave/sync.git@896d733ddcf5fb1a99611a0830d4824b4cb22a68",
"components/brave_sync/extension/brave-crypto": "https://github.com/brave/crypto@54f35a7bd6e297620c6add188f1b31af3d0ec561",
"vendor/bat-native-usermodel": "https://github.com/brave-intl/bat-native-usermodel.git@c3b6111aa862c5c452c84be8a225d5f1df32b284",
"vendor/bat-native-usermodel": "https://github.com/brave-intl/bat-native-usermodel.git@c1745b906079285fc01e3079ac49b0e65fde0f98",
"vendor/challenge_bypass_ristretto_ffi": "https://github.com/brave-intl/challenge-bypass-ristretto-ffi.git@2c0e28f76e4b6f53947bf4faa5afd93614f96aca",
}

Expand Down
2 changes: 1 addition & 1 deletion app/app_management_strings.grdp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
other {<ph name="APP_1">$1<ex>Gmail</ex></ph>, <ph name="APP_2">$2<ex>Youtube</ex></ph>, <ph name="APP_3">$3<ex>Calendar</ex></ph>, and <ph name="EXTRA_APPS">$4<ex>4</ex></ph> other apps}}
</message>
<message name="IDS_APP_MANAGEMENT_APP_LIST_TITLE" desc="Title of app list card on main app management page.">
Recently opened apps
Your apps
</message>
<message name="IDS_APP_MANAGEMENT_BACK" desc="Label for button for going back to the previous page.">
Back
Expand Down
6 changes: 0 additions & 6 deletions app/bookmarks_strings.grdp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,12 +416,6 @@
<message name="IDS_BOOKMARK_MANAGER_SIDEBAR_AX_LABEL" desc="Message announced by screenreaders for the bookmark manager sidebar.">
Bookmark folder tree
</message>
<message name="IDS_BOOKMARK_MANAGER_SIDEBAR_NODE_COLLAPSE_AX_LABEL" desc="Message announced by screenreaders for button to collapse a folder in the bookmark manager sidebar.">
Collapse <ph name="FOLDER_NAME">$1<ex>Recipes</ex></ph>
</message>
<message name="IDS_BOOKMARK_MANAGER_SIDEBAR_NODE_EXPAND_AX_LABEL" desc="Message announced by screenreaders for button to expand a folder in the bookmark manager sidebar.">
Expand <ph name="FOLDER_NAME">$1<ex>Recipes</ex></ph>
</message>
<message name="IDS_BOOKMARK_MANAGER_TOAST_FOLDER_SORTED" desc="Label displayed in toast popup message when a folder's children are sorted.">
Folder sorted
</message>
Expand Down
8 changes: 4 additions & 4 deletions app/brave_main_delegate.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/common/chrome_switches.h"
#include "components/autofill/core/common/autofill_features.h"
#include "components/autofill/core/common/autofill_payments_features.h"
#include "components/password_manager/core/common/password_manager_features.h"
#include "components/unified_consent/feature.h"
#include "content/public/common/content_features.h"
Expand Down Expand Up @@ -67,11 +68,10 @@ BraveMainDelegate::CreateContentBrowserClient() {
return NULL;
#else
if (chrome_content_browser_client_ == nullptr) {
DCHECK(!chrome_feature_list_creator_);
chrome_feature_list_creator_ = std::make_unique<ChromeFeatureListCreator>();
DCHECK(!startup_data_);
startup_data_ = std::make_unique<StartupData>();
chrome_content_browser_client_ =
std::make_unique<BraveContentBrowserClient>(
chrome_feature_list_creator_.get());
std::make_unique<BraveContentBrowserClient>(startup_data_.get());
}
return chrome_content_browser_client_.get();
#endif
Expand Down
1 change: 1 addition & 0 deletions app/brave_main_delegate_browsertest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/browser/domain_reliability/service_factory.h"
#include "components/autofill/core/common/autofill_features.h"
#include "components/autofill/core/common/autofill_payments_features.h"
#include "components/unified_consent/feature.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/common/content_features.h"
Expand Down
35 changes: 32 additions & 3 deletions app/brave_strings.grd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,19 +422,34 @@ Brave is unable to recover your settings.
<message name="IDS_PROMPT_DOWNLOAD_CHANGES_SETTINGS" desc="Message shown on the download shelf when the download is known to change settings in the browser in a malicious way.">
<ph name="FILE_NAME">$1<ex>bla.exe</ex></ph> may be dangerous, so Brave has blocked it.
</message>
<message name="IDS_PROMPT_DOWNLOAD_CHANGES_SETTINGS_IN_ADVANCED_PROTECTION" desc="Message shown on the download shelf when the download is known to change settings in the browser in a malicious way. This variant is shown when the user is enrolled in the Advanced Protection program.">
<ph name="FILE_NAME">$1<ex>bla.exe</ex></ph> may be dangerous, so Brave has blocked it. You're defended by Advanced Protection.
</message>

<message name="IDS_PROMPT_MALICIOUS_DOWNLOAD_URL" desc="Message shown to the user to validate the download when the download url is classified to lead to malware by the safebrowsing database.">
This file is dangerous, so Brave has blocked it.
</message>
<message name="IDS_PROMPT_MALICIOUS_DOWNLOAD_URL_IN_ADVANCED_PROTECTION" desc="Message shown to the user to validate the download when the download url is classified to lead to malware by the safebrowsing database. This variant is shown when the user is enrolled in this Advanced Protection program.">
This file is dangerous, so Brave has blocked it. You're defended by Advanced Protection.
</message>
<message name="IDS_PROMPT_MALICIOUS_DOWNLOAD_CONTENT" desc="Message shown to the user to validate the download when the download content is classified to lead to malware by safebrowsing.">
<ph name="FILE_NAME">$1<ex>malware.exe</ex></ph> is dangerous, so Brave has blocked it.
</message>
<message name="IDS_PROMPT_MALICIOUS_DOWNLOAD_CONTENT_IN_ADVANCED_PROTECTION" desc="Message shown to the user to validate the download when the download content is classified to lead to malware by safebrowsing. This variant is shown when the user is enrolled in the Advanced Protection program.">
<ph name="FILE_NAME">$1<ex>malware.exe</ex></ph> is dangerous, so Brave has blocked it. You're defended by Advanced Protection.
</message>
<message name="IDS_BLOCK_REASON_DANGEROUS_DOWNLOAD" desc="Message shown to the user on chrome://downloads page to explain that this download is blocked because it is malware.">
This file is dangerous, so Brave has blocked it.
</message>
<message name="IDS_BLOCK_REASON_DANGEROUS_DOWNLOAD_IN_ADVANCED_PROTECTION" desc="Message shown to the user on chrome://downloads page to explain that this download is blocked because it is malware. This variant is shown when the user is enrolled in the Advanced Protection program.">
This file is dangerous, so Brave has blocked it. You're defended by Advanced Protection.
</message>
<message name="IDS_BLOCK_REASON_UNWANTED_DOWNLOAD" desc="Message shown to the user on chrome://downloads page to explain that this download is blocked because it is unwanted sofware.">
This file may be dangerous, so Brave has blocked it.
</message>
<message name="IDS_BLOCK_REASON_UNWANTED_DOWNLOAD_IN_ADVANCED_PROTECTION" desc="Message shown to the user on chrome://downloads page to explain that this download is blocked because it is unwanted sofware. This variant is shown when the user is enrolled in the Advanced Protection program.">
This file may be dangerous, so Brave has blocked it. You're defended by Advanced Protection.
</message>

<!-- Abandon in-progress downloads confirmation dialog -->
<if expr="not is_macosx">
Expand Down Expand Up @@ -542,7 +557,7 @@ Brave is unable to recover your settings.
<message name="IDS_EXTENSIONS_UNINSTALL" desc="The link for uninstalling extensions.">
Remove from Brave...
</message>
<message name="IDS_MD_EXTENSIONS_SHORTCUT_SCOPE_IN_CHROME" desc="The label to indicate that a shortcut will be triggerable only from within the Brave application.">
<message name="IDS_EXTENSIONS_SHORTCUT_SCOPE_IN_CHROME" desc="The label to indicate that a shortcut will be triggerable only from within the Brave application.">
In Brave
</message>

Expand Down Expand Up @@ -681,9 +696,12 @@ Signing in anyway will merge Brave information like bookmarks, history, and othe

<!-- about:browser-switch strings -->
<if expr="is_win or is_macosx or (is_linux and not is_chromeos)">
<message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION" desc="Description shown while waiting for an alternative browser to open">
<message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected">
Your system administrator has configured Brave to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
</message>
<message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_KNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is auto-detected">
Your system administrator has configured Brave to open <ph name="ALTERNATIVE_BROWSER_NAME">$2<ex>Internet Explorer</ex></ph> to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>.
</message>
</if>

<!-- Signin Email Confirmation tab modal dialog -->
Expand Down Expand Up @@ -912,7 +930,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>[email protected]</
If an image doesn’t have a useful description, Brave will try to provide one for you. To create descriptions, images are sent to Brave.
</message>
<message name="IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT" desc="The text of a bubble that confirms users allows integrating the spelling service of Brave to Brave.">
Brave can provide smarter spell-checking by sending what you type in the browser to Brave servers, allowing you to use the same spell-checking technology used by Brave search.
This uses the same spellchecker that's used in Brave search. Text you type in the browser is sent to Brave. You can always change this behavior in settings.
</message>
<if expr="not use_titlecase">
<message name="IDS_CONTENT_CONTEXT_OPENLINKNEWTAB_INAPP" desc="The name of the command to open a link in a newly created browser tab when the user is in an app window">
Expand Down Expand Up @@ -962,6 +980,17 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>[email protected]</
</message>
</if>

<!-- Cannot update when other instances open dialog -->
<message name="IDS_UPDATE_OTHER_INSTANCES_SAME_USER_DIALOG_TITLE" desc="The title for the dialog shown when multiple copies of Brave are running during a requested update.">
Quit all copies of Brave.
</message>
<message name="IDS_UPDATE_OTHER_INSTANCES_SAME_USER_DIALOG_MESSAGE" desc="The message for the dialog shown when multiple copies of Brave are running during a requested update.">
Other copies of Brave are running. To update, close them.
</message>
<message name="IDS_UPDATE_OTHER_INSTANCES_OTHER_USER_AUTHENTICATION_PROMPT" desc="The window title for the other instances dialog.">
To update, Brave needs to stop running on this computer. This may cause other users logged into this computer to lose unsaved changes.
</message>

<!-- Update bubble -->
<message name="IDS_REINSTALL_APP" desc="Text for the button the user clicks to reinstall the app.">
Reinstall Brave
Expand Down
Loading