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

Upgrade to Chromium 70.0.3528.4 #358

Merged
merged 13 commits into from
Aug 25, 2018
Merged

Upgrade to Chromium 70.0.3528.4 #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7935bdc
Update patches for 70.0.3528.4
bbondy Aug 24, 2018
7194123
Fix for native ledger lib for 70.0.3528.4
bbondy Aug 24, 2018
f8fca88
Update source strings for Chromium 70.0.3528.4
bbondy Aug 24, 2018
b641dd7
Update XTB files for Chromium 70.0.3528.4
bbondy Aug 24, 2018
b1a5eb5
Rename base/task_scheduler -> base/task
bbondy Aug 24, 2018
ee0e041
Rename COLOR_TOOLBAR_BOTTOM_SEPARATOR -> COLOR_TOOLBAR_CONTENT_AREA_S…
bbondy Aug 24, 2018
01e9461
Split generated api bundle and types
bbondy Aug 24, 2018
730d833
sql/connection -> sql/database
bbondy Aug 24, 2018
e3d7068
DEFINE_WEB_CONTENTS_USER_DATA_KEY no longer needed
bbondy Aug 24, 2018
5f248b8
base::TaskPriority::BACKGROUND -> BEST_EFFORT
bbondy Aug 24, 2018
f3c4078
Various updates for Chromium 70.0.3528.4
bbondy Aug 24, 2018
d7fd9a6
Sync up run_all_tests.cc with Chromium's version
bbondy Aug 24, 2018
e7b3238
We want use_egl=true but bundle_egl_libraries=false
bbondy Aug 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
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 @@ -10,7 +10,7 @@ deps = {
"vendor/boto": "https://github.com/boto/boto@f7574aa6cc2c819430c1f05e9a1a1a666ef8169b",
"vendor/python-patch": "https://github.com/svn2github/python-patch@a336a458016ced89aba90dfc3f4c8222ae3b1403",
"vendor/sparkle": "https://github.com/brave/Sparkle.git@c0759cce415d7c0feae45005c8a013b1898711f0",
"vendor/bat-native-ledger": "https://github.com/brave-intl/bat-native-ledger@a3e64797bf6ebbfa39a60240db8d82995f97ebd9",
"vendor/bat-native-ledger": "https://github.com/brave-intl/bat-native-ledger@123d1dec129528390eaf583d04e5dc2b6c426713",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what was this bumped to?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bumped to same as what it was + this:
brave-intl/bat-native-ledger@123d1de

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, I guess I had already removed the post task stuff but just forgot about the header at that point

"vendor/bat-native-rapidjson": "https://github.com/brave-intl/bat-native-rapidjson.git@86aafe2ef89835ae71c9ed7c2527e3bb3000930e",
"vendor/bip39wally-core-native": "https://github.com/brave-intl/bip39wally-core-native.git@9b119931c702d55be994117eb505d56310720b1d",
"vendor/bat-native-anonize": "https://github.com/brave-intl/bat-native-anonize.git@6f5817c5a4dcabb49e22b578ecae4993159e6481",
Expand Down
119 changes: 84 additions & 35 deletions app/brave_strings.grd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ Brave is unable to recover your settings.

<!-- Print Preview -->
<message name="IDS_PRINT_PREVIEW_NO_PLUGIN" desc="Message to display when the PDF viewer is missing.">
Brave does not include the PDF viewer which is required for Print Preview to function.
Brave cannot show the print preview when the built-in PDF viewer is missing.
</message>

<!-- Download Shelf Items -->
Expand Down Expand Up @@ -943,6 +943,9 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
</message>
</if>
<if expr="chromeos">
<message name="IDS_UPDATE_RECOMMENDED_DIALOG_TITLE" desc="The window title for the Update Recommended dialog.">
Restart Brave OS
</message>
<message name="IDS_UPDATE_RECOMMENDED" desc="The main text of the Update Recommended dialog.">
Brave OS needs to be restarted to apply the update.
</message>
Expand Down Expand Up @@ -1093,6 +1096,13 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
</message>
</if>

<!-- OOM intervention message -->
<if expr="is_android">
<message name="IDS_NEAR_OOM_REDUCTION_MESSAGE" desc="The message stating that the browser removed some content of the page using too much memory.">
This page uses too much memory, so Brave removed some content.
</message>
</if>

<!-- OOBE -->
<if expr="chromeos">
<message name="IDS_INSTALLING_UPDATE" desc="Label shown on the updates installation screen during OOBE">
Expand Down Expand Up @@ -1167,40 +1177,79 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
</message>
</if>
<!-- Relaunch notification bubble and dialog. -->
<if expr="not is_android and not chromeos">
<message name="IDS_RELAUNCH_RECOMMENDED_TITLE" desc="The title of a dialog that tells users that a browser relaunch is recommended for an update available for some number of days.">
{0, plural,
=0 {A Brave update is available}
=1 {A Brave update is available}
other {A Brave update has been available for # days}}
</message>
<message name="IDS_RELAUNCH_RECOMMENDED_BODY" desc="The body text of a dialog that tells users that a browser relaunch is recommended for an update.">
Your administrator asks that you relaunch Brave to apply this update
</message>
<message name="IDS_RELAUNCH_REQUIRED_TITLE_DAYS" desc="The title of a dialog that tells users the browser must be relaunched within two or more days.">
{0, plural,
=1 {Relaunch Brave within a day}
other {Relaunch Brave within # days}}
</message>
<message name="IDS_RELAUNCH_REQUIRED_TITLE_HOURS" desc="The title of a dialog that tells users the browser must be relaunched within one or more hours.">
{0, plural,
=1 {Brave will relaunch in an hour}
other {Brave will relaunch in # hours}}
</message>
<message name="IDS_RELAUNCH_REQUIRED_TITLE_MINUTES" desc="The title of a dialog that tells users the browser must be relaunched within one or more minutes.">
{0, plural,
=1 {Brave will relaunch in 1 minute}
other {Brave will relaunch in # minutes}}
</message>
<message name="IDS_RELAUNCH_REQUIRED_TITLE_SECONDS" desc="The title of a dialog that tells users the browser must be relaunched within some number of seconds.">
{0, plural,
=0 {Brave will relaunch now}
=1 {Brave will relaunch in 1 second}
other {Brave will relaunch in # seconds}}
</message>
<message name="IDS_RELAUNCH_REQUIRED_BODY" desc="The body text of a dialog that tells users the browser must be relaunched.">
Your administrator requires that you relaunch Brave to apply an update
</message>
<if expr="not is_android">
<if expr="not chromeos">
<then>
<message name="IDS_RELAUNCH_RECOMMENDED_TITLE" desc="The title of a dialog that tells users that a browser relaunch is recommended for an update available for some number of days.">
{0, plural,
=0 {A Brave update is available}
=1 {A Brave update is available}
other {A Brave update has been available for # days}}
</message>
<message name="IDS_RELAUNCH_RECOMMENDED_BODY" desc="The body text of a dialog that tells users that a browser relaunch is recommended for an update.">
Your administrator asks that you relaunch Brave to apply this update
</message>
<message name="IDS_RELAUNCH_REQUIRED_TITLE_DAYS" desc="The title of a dialog that tells users the browser must be relaunched within two or more days.">
{0, plural,
=1 {Relaunch Brave within a day}
other {Relaunch Brave within # days}}
</message>
<message name="IDS_RELAUNCH_REQUIRED_TITLE_HOURS" desc="The title of a dialog that tells users the browser must be relaunched within one or more hours.">
{0, plural,
=1 {Brave will relaunch in an hour}
other {Brave will relaunch in # hours}}
</message>
<message name="IDS_RELAUNCH_REQUIRED_TITLE_MINUTES" desc="The title of a dialog that tells users the browser must be relaunched within one or more minutes.">
{0, plural,
=1 {Brave will relaunch in 1 minute}
other {Brave will relaunch in # minutes}}
</message>
<message name="IDS_RELAUNCH_REQUIRED_TITLE_SECONDS" desc="The title of a dialog that tells users the browser must be relaunched within some number of seconds.">
{0, plural,
=0 {Brave will relaunch now}
=1 {Brave will relaunch in 1 second}
other {Brave will relaunch in # seconds}}
</message>
<message name="IDS_RELAUNCH_REQUIRED_BODY" desc="The body text of a dialog that tells users the browser must be relaunched.">
Your administrator requires that you relaunch Brave to apply an update
</message>
</then>
<else>
<message name="IDS_RELAUNCH_RECOMMENDED_TITLE" desc="The title of a dialog that tells users that a device restart is recommended for an update available for some number of days.">
{0, plural,
=0 {A Brave OS update is available}
=1 {A Brave OS update is available}
other {A Brave OS update has been available for # days}}
</message>
<message name="IDS_RELAUNCH_RECOMMENDED_BODY" desc="The body text of a dialog that tells users that a device restart is recommended for an update.">
Your administrator asks that you restart Brave OS to apply this update
</message>
<message name="IDS_RELAUNCH_REQUIRED_TITLE_DAYS" desc="The title of a dialog that tells users the device must be restarted within two or more days.">
{0, plural,
=1 {Restart Brave OS within a day}
other {Restart Brave OS within # days}}
</message>
<message name="IDS_RELAUNCH_REQUIRED_TITLE_HOURS" desc="The title of a dialog that tells users the device must be restarted within one or more hours.">
{0, plural,
=1 {Brave OS will restart in an hour}
other {Brave OS will restart in # hours}}
</message>
<message name="IDS_RELAUNCH_REQUIRED_TITLE_MINUTES" desc="The title of a dialog that tells users the device must be restarted within one or more minutes.">
{0, plural,
=1 {Brave OS will restart in 1 minute}
other {Brave OS will restart in # minutes}}
</message>
<message name="IDS_RELAUNCH_REQUIRED_TITLE_SECONDS" desc="The title of a dialog that tells users the device must be restarted within some number of seconds.">
{0, plural,
=0 {Brave OS will restart now}
=1 {Brave OS will restart in 1 second}
other {Brave OS will restart in # seconds}}
</message>
<message name="IDS_RELAUNCH_REQUIRED_BODY" desc="The body text of a dialog that tells users the device must be restarted.">
Your administrator requires that you restart Brave OS to apply an update
</message>
</else>
</if>
</if>
<!-- Chroium launch blocking dialog. -->
<if expr="not is_android and not chromeos">
Expand Down
Loading