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

Upgrade patches from Chromium 77.0.3865.90 to Chromium 78.0.3904.44 #3600

Closed
wants to merge 70 commits into from
Closed
Show file tree
Hide file tree
Changes from 67 commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
2b3c64c
Upgrade patches from Chromium 77.0.3865.75 to Chromium 78.0.3904.44
mkarolin Sep 19, 2019
1620750
Rename ProfileChooserView to ProfileMenuView
mkarolin Sep 19, 2019
d6c93a6
ProfileMenuView: button clicks now use action callbacks.
mkarolin Sep 25, 2019
aafd4c9
UIThreadExtensionFunction -> ExtensionFunction.
mkarolin Sep 19, 2019
e3d2f71
thread_pool.h -> thread_pool_instance.h
mkarolin Sep 19, 2019
831b6d2
//brave/components/omnibox/browser added dep on //third_party/icu
mkarolin Sep 19, 2019
ccf854a
Move ResourceRequestInfo::WebContentsGetter to WebContents::Getter
mkarolin Sep 19, 2019
812c8b7
ResourceRequestInfo has been removed.
mkarolin Sep 19, 2019
4e9201e
Tasks require explicit thread destination.
mkarolin Sep 20, 2019
9f6ac2d
network::ResourceRequest::allow_credentials -> credentials_mode.
mkarolin Sep 20, 2019
981e910
Browser::TYPE_TABBED -> TYPE_NORMAL
mkarolin Sep 20, 2019
d318e08
ProfileManager::DoFinalInitForServices became private and non-virtual.
mkarolin Sep 20, 2019
f35106f
extensions::APIRequestHandler::StartRequest signature change.
mkarolin Sep 20, 2019
78d6fb8
HistoryProvider::PreventInlineAutocomplete was removed.
mkarolin Sep 20, 2019
e7625c0
unzip::UnzipWithFilter signature change.
mkarolin Sep 30, 2019
67f9948
update_client::UnzipChromiumFactory signature change.
mkarolin Sep 20, 2019
fe763b3
update_client::PatchChromiumFactory signature change.
mkarolin Sep 20, 2019
673f2a4
Virtual was removed from BrowserContextKeyedServiceFactory's method.
mkarolin Sep 20, 2019
9ed2774
content::CommonNavigationParams was converted to mojom.
mkarolin Sep 20, 2019
5bcb515
WillCreateURLLoaderFactory signature changes.
mkarolin Sep 20, 2019
1ccbdf2
URLLoader::ProceedWithResponse was removed.
mkarolin Sep 21, 2019
a73d1d8
URLLoaderClient methods signature changes.
mkarolin Sep 21, 2019
413fb2a
Variable name change.
mkarolin Sep 21, 2019
eab7f32
MaterialRefreshLayoutProvider was merged into ChromeLayoutProvider.
mkarolin Sep 23, 2019
67a1c3f
NativeTheme::SystemDarkModeEnabled renamed to ShouldUseDarkColors.
mkarolin Sep 23, 2019
289a3a5
LoginDatabase account vs profile scoped.
mkarolin Sep 23, 2019
df5eb83
IDC_BOOKMARK_PAGE -> IDC_BOOKMARK_THIS_TAB
mkarolin Sep 23, 2019
78492c8
URLPattern::ALLOW_WILDCARD_FOR_EFFECTIVE_TLD has been removed.
mkarolin Sep 23, 2019
b907e28
WebUIDataSource::SetJsonPath -> UseStringsJs.
mkarolin Sep 23, 2019
2631b53
ChromeTextStyle::STYLE_SECONDARY -> views::styles::STYLE_SECONDARY.
mkarolin Sep 23, 2019
b2e37f9
ExtensionAction::GetBadgeText -> GetExplicitlySetBadgeText.
mkarolin Sep 23, 2019
7284572
ToolbarActionView::Delegate::GetOverflowReferenceView signature changes.
mkarolin Sep 23, 2019
06c1e3e
NotificationHandler::Type enum has been extended.
mkarolin Sep 23, 2019
76ab54a
Textfield::text() -> GetText()
mkarolin Sep 23, 2019
dbb997c
AvatarToolbarButton::GetAvatarIcon signature change.
mkarolin Sep 23, 2019
951921f
PermissionTypeToContentSetting -> PermissionTypeToContentSettingSafe.
mkarolin Sep 23, 2019
fc12fa3
Added missing constants in chrome_constants override.
mkarolin Sep 26, 2019
a05c918
Added missing constants in url_constants override.
mkarolin Sep 26, 2019
75b7975
GoogleURLTracker has been removed.
mkarolin Sep 27, 2019
01652af
Budget service was removed.
mkarolin Sep 27, 2019
61972a3
theme_service_aurax11.h was renamed.
mkarolin Sep 27, 2019
17f7aa7
crashpad_linux.cc was renamed to crashpad_android.cc
mkarolin Sep 27, 2019
00bcb0f
Background hover and pressed colors were removed from tab style.
mkarolin Sep 23, 2019
94fe549
ResourceRequest::trusted_network_isolation_key moved to TrustedParams.
mkarolin Sep 23, 2019
9fbdb2a
CreateWebSocket signature change.
mkarolin Sep 20, 2019
ef65eb5
WebSocketHandshakeClient::OnConnectionEstablished signature change.
mkarolin Sep 23, 2019
f776007
Changes to web sockets proxying.
mkarolin Sep 24, 2019
ec7207b
TEMP: Commented out uses of ResourceRequestInfo.
mkarolin Sep 25, 2019
a4a1e87
CanonicalCookie::Create signature change.
mkarolin Sep 25, 2019
2e3d38d
Subclass RenderViewHostTestHarness instead of ChromeRenderViewHostTes…
mkarolin Sep 26, 2019
200765a
Unit tests: header files were renamed.
mkarolin Sep 26, 2019
c0a0088
BookmarkNode c'tor signature change.
mkarolin Sep 26, 2019
c33f57d
Updated mock RenderViewContextMenu with missing API methods.
mkarolin Sep 27, 2019
05caf5b
RunLoop::RunWithTimeout was removed.
mkarolin Sep 27, 2019
26198fe
BrowserAddedObserver was removed.
mkarolin Sep 27, 2019
3841ff6
Added a missing header include.
mkarolin Sep 27, 2019
8aac851
Updated bat-native-tweetnacl DEP to the latest rev.
mkarolin Sep 30, 2019
58e8b67
Android: removed passing jcaller to the native side.
mkarolin Oct 1, 2019
4327998
Android: Remove Compat suffix from Preferences
mkarolin Oct 1, 2019
0b97bb3
Android: SigninManager c'tor/create signature changes.
mkarolin Oct 5, 2019
3f77bff
Mac signing: change in script param.
mkarolin Oct 1, 2019
b007b6a
Updated getSectionElement in brave_settings_overrides.
mkarolin Oct 3, 2019
f397672
Browser test: fixes waiting for browser to open/close.
mkarolin Oct 3, 2019
1901180
Browser Test: window.open with noopener no longer opens a new tab for…
mkarolin Oct 3, 2019
1b8d2cf
ProfileImpl c'tor signature change.
mkarolin Oct 4, 2019
687771f
Lint fixes.
mkarolin Oct 4, 2019
d657783
Update strings for 78.0.3904.44
mkarolin Sep 19, 2019
d2f4fff
network audit fix
jumde Oct 9, 2019
a3d879b
lint fix
bsclifton Oct 9, 2019
98b6296
Merge pull request #3646 from brave/78.0.3904.44_network_audit
bsclifton Oct 9, 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
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ deps = {
"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@13bb40a215248cfbdd87d0a6b425c8397402e9e6",
"vendor/bat-native-anonize": "https://github.com/brave-intl/bat-native-anonize.git@e3742ba3e8942eea9e4755d91532491871bd3116",
"vendor/bat-native-tweetnacl": "https://github.com/brave-intl/bat-native-tweetnacl.git@1b4362968c8f22720bfb75af6f506d4ecc0f3116",
"vendor/bat-native-tweetnacl": "https://github.com/brave-intl/bat-native-tweetnacl.git@dd0c535898a645b84d6f3372b393bdad6746108c",
"components/brave_sync/extension/brave-sync": "https://github.com/brave/sync.git@e50a5810c12170ed0e9a9d2c9d69a5e05a77f837",
"vendor/bat-native-usermodel": "https://github.com/brave-intl/bat-native-usermodel.git@a82acda22d8cb255d86ee28734efb8ad886e9a49",
"vendor/challenge_bypass_ristretto_ffi": "https://github.com/brave-intl/challenge-bypass-ristretto-ffi.git@f88d942ddfaf61a4a6703355a77c4ef71bc95c35",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import org.chromium.chrome.R;
import org.chromium.chrome.browser.BraveRelaunchUtils;
import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
import org.chromium.chrome.browser.preferences.ChromeSwitchPreferenceCompat;
import org.chromium.chrome.browser.preferences.ChromeSwitchPreference;
import org.chromium.ui.base.DeviceFormFactor;

public class AppearancePreferences
Expand Down Expand Up @@ -48,10 +48,10 @@ public void onActivityCreated(Bundle savedInstanceState) {
if (enableBottomToolbar == null) return;

enableBottomToolbar.setOnPreferenceChangeListener(this);
if (enableBottomToolbar instanceof ChromeSwitchPreferenceCompat) {
if (enableBottomToolbar instanceof ChromeSwitchPreference) {
boolean isTablet = DeviceFormFactor.isNonMultiDisplayContextOnTablet(
ContextUtils.getApplicationContext());
((ChromeSwitchPreferenceCompat) enableBottomToolbar)
((ChromeSwitchPreference) enableBottomToolbar)
.setChecked(!isTablet
&& ChromePreferenceManager.getInstance().isBottomToolbarEnabled());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import org.chromium.chrome.R;
import org.chromium.chrome.browser.BraveRelaunchUtils;
import org.chromium.chrome.browser.preferences.ChromeSwitchPreferenceCompat;
import org.chromium.chrome.browser.preferences.ChromeSwitchPreference;

public class BackgroundVideoPlaybackPreference
extends PreferenceFragmentCompat implements Preference.OnPreferenceChangeListener {
Expand All @@ -22,8 +22,8 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
getActivity().setTitle(R.string.prefs_background_video_playback);
PreferenceUtils.addPreferencesFromResource(this, R.xml.background_video_playback_preference);

ChromeSwitchPreferenceCompat playbackPref =
(ChromeSwitchPreferenceCompat) findPreference(BACKGROUND_VIDEO_PLAYBACK_KEY);
ChromeSwitchPreference playbackPref =
(ChromeSwitchPreference) findPreference(BACKGROUND_VIDEO_PLAYBACK_KEY);
playbackPref.setChecked(BravePrefServiceBridge.getInstance().getBackgroundVideoPlaybackEnabled());
playbackPref.setOnPreferenceChangeListener(this);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ private void removePreferenceIfPresent(String key) {

private void updateSearchEnginePreference() {
if (!TemplateUrlServiceFactory.get().isLoaded()) {
ChromeBasePreferenceCompat searchEnginePref =
(ChromeBasePreferenceCompat) findPreference(PREF_SEARCH_ENGINE_SECTION);
ChromeBasePreference searchEnginePref =
(ChromeBasePreference) findPreference(PREF_SEARCH_ENGINE_SECTION);
searchEnginePref.setEnabled(false);
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import android.support.v7.preference.PreferenceFragmentCompat;

import org.chromium.chrome.R;
import org.chromium.chrome.browser.preferences.ChromeSwitchPreferenceCompat;
import org.chromium.chrome.browser.preferences.ChromeSwitchPreference;
import org.chromium.chrome.browser.partnercustomizations.CloseBraveManager;

public class ClosingAllTabsClosesBravePreference
Expand All @@ -26,8 +26,8 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
getActivity().setTitle(R.string.prefs_closing_all_tabs_closes_brave);
PreferenceUtils.addPreferencesFromResource(this, R.xml.closing_all_tabs_closes_brave_preference);

ChromeSwitchPreferenceCompat pref =
(ChromeSwitchPreferenceCompat) findPreference(CLOSING_ALL_TABS_CLOSES_BRAVE_KEY);
ChromeSwitchPreference pref =
(ChromeSwitchPreference) findPreference(CLOSING_ALL_TABS_CLOSES_BRAVE_KEY);
pref.setChecked(CloseBraveManager.getClosingAllTabsClosesBraveEnabled());
pref.setOnPreferenceChangeListener(this);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import org.chromium.base.ContextUtils;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
import org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreferenceCompat;
import org.chromium.chrome.browser.preferences.ChromeBaseCheckBoxPreference;
import org.chromium.chrome.browser.preferences.PreferenceUtils;
import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferences;

Expand All @@ -29,20 +29,20 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {

super.onCreatePreferences(savedInstanceState, rootKey);

ChromeBaseCheckBoxPreferenceCompat httpsePref =
(ChromeBaseCheckBoxPreferenceCompat) findPreference(PREF_HTTPSE);
ChromeBaseCheckBoxPreference httpsePref =
(ChromeBaseCheckBoxPreference) findPreference(PREF_HTTPSE);
httpsePref.setOnPreferenceChangeListener(this);

ChromeBaseCheckBoxPreferenceCompat adBlockPref =
(ChromeBaseCheckBoxPreferenceCompat) findPreference(PREF_AD_BLOCK);
ChromeBaseCheckBoxPreference adBlockPref =
(ChromeBaseCheckBoxPreference) findPreference(PREF_AD_BLOCK);
adBlockPref.setOnPreferenceChangeListener(this);

ChromeBaseCheckBoxPreferenceCompat fingerprintingProtectionPref =
(ChromeBaseCheckBoxPreferenceCompat) findPreference(PREF_FINGERPRINTING_PROTECTION);
ChromeBaseCheckBoxPreference fingerprintingProtectionPref =
(ChromeBaseCheckBoxPreference) findPreference(PREF_FINGERPRINTING_PROTECTION);
fingerprintingProtectionPref.setOnPreferenceChangeListener(this);

ChromeBaseCheckBoxPreferenceCompat closeTabsOnExitPref =
(ChromeBaseCheckBoxPreferenceCompat) findPreference(PREF_CLOSE_TABS_ON_EXIT);
ChromeBaseCheckBoxPreference closeTabsOnExitPref =
(ChromeBaseCheckBoxPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
closeTabsOnExitPref.setOnPreferenceChangeListener(this);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
package org.chromium.chrome.browser.preferences.website;

import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JCaller;
import org.chromium.base.annotations.JNINamespace;
import org.chromium.base.annotations.NativeMethods;
import org.chromium.base.Log;
Expand Down Expand Up @@ -108,7 +107,7 @@ private void blockedEvent(int tabId, String block_type, String subresource) {

@NativeMethods
interface Natives {
void init(@JCaller BraveShieldsContentSettings self);
void init(BraveShieldsContentSettings self);
void destroy(long nativeBraveShieldsContentSettings);

void setBraveShieldsEnabled(boolean enabled, String url, Profile profile);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import org.chromium.chrome.R;
import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
import org.chromium.chrome.browser.preferences.ChromeSwitchPreferenceCompat;
import org.chromium.chrome.browser.preferences.ChromeSwitchPreference;
import org.chromium.chrome.browser.preferences.PreferenceUtils;

public class DesktopModePreferences
Expand All @@ -23,8 +23,8 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
getActivity().setTitle(R.string.settings_desktop_mode_title);
PreferenceUtils.addPreferencesFromResource(this, R.xml.desktop_mode_preferences);

ChromeSwitchPreferenceCompat desktopModePref =
(ChromeSwitchPreferenceCompat) findPreference(DESKTOP_MODE_KEY);
ChromeSwitchPreference desktopModePref =
(ChromeSwitchPreference) findPreference(DESKTOP_MODE_KEY);
desktopModePref.setChecked(BravePrefServiceBridge.getInstance().getDesktopModeEnabled());
desktopModePref.setOnPreferenceChangeListener(this);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import org.chromium.base.ContextUtils;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.preferences.BravePrefServiceBridge;
import org.chromium.chrome.browser.preferences.ChromeSwitchPreferenceCompat;
import org.chromium.chrome.browser.preferences.ChromeSwitchPreference;
import org.chromium.chrome.browser.preferences.PreferenceUtils;

public class PlayYTVideoInBrowserPreferences
Expand All @@ -25,8 +25,8 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
getActivity().setTitle(R.string.settings_play_yt_video_in_browser_title);
PreferenceUtils.addPreferencesFromResource(this, R.xml.play_yt_video_in_browser_preferences);

ChromeSwitchPreferenceCompat pref =
(ChromeSwitchPreferenceCompat) findPreference(PLAY_YT_VIDEO_IN_BROWSER_KEY);
ChromeSwitchPreference pref =
(ChromeSwitchPreference) findPreference(PLAY_YT_VIDEO_IN_BROWSER_KEY);
// Initially enabled.
pref.setChecked(
BravePrefServiceBridge.getInstance().getPlayYTVideoInBrowserEnabled());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
import org.chromium.base.ContextUtils;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.components.signin.AccountTrackerService;
import org.chromium.components.sync.AndroidSyncSettings;

public class BraveSigninManager extends SigninManager {
BraveSigninManager(Context context, long nativeSigninManagerAndroid, SigninManagerDelegate delegate,
BraveSigninManager(Context context, long nativeSigninManagerAndroid,
AccountTrackerService accountTrackerService) {
super(context, nativeSigninManagerAndroid, delegate, accountTrackerService);
super(context, nativeSigninManagerAndroid, accountTrackerService,
AndroidSyncSettings.get());
}

@Override
Expand All @@ -28,12 +30,11 @@ public boolean isSigninSupported() {
}

@CalledByNative
private static SigninManager create(long nativeSigninManagerAndroid,
SigninManagerDelegate delegate, AccountTrackerService accountTrackerService) {
private static SigninManager create(
long nativeSigninManagerAndroid, AccountTrackerService accountTrackerService) {
assert nativeSigninManagerAndroid != 0;
assert delegate != null;
assert accountTrackerService != null;
return new BraveSigninManager(ContextUtils.getApplicationContext(), nativeSigninManagerAndroid,
delegate, accountTrackerService);
return new BraveSigninManager(ContextUtils.getApplicationContext(),
nativeSigninManagerAndroid, accountTrackerService);
}
}
8 changes: 7 additions & 1 deletion app/app_management_strings.grdp
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<message name="IDS_APP_MANAGEMENT_SIZE" desc="Label for the size of an app in the app settings page.">
Size: <ph name="APP_SIZE">$1<ex>8.0MB</ex></ph>
</message>
<message name="IDS_APP_MANAGEMENT_UNINSTALL" desc="Label for the uninstall button in the app settings page.">
<message name="IDS_APP_MANAGEMENT_UNINSTALL_APP" desc="Label for the uninstall button in the app settings page.">
Uninstall
</message>
<message name="IDS_APP_MANAGEMENT_VERSION" desc="Label for version of an app in the app settings page.">
Expand All @@ -85,4 +85,10 @@
<message name="IDS_APP_MANAGEMENT_STORAGE" desc="Label for the Android storage permission toggle.">
Storage
</message>
<message name="IDS_APP_MANAGEMENT_SYSTEM_APP_POLICY_STRING" desc="Tooltip label explaining that an app cannot be uninstalled as it is a part of Brave OS (the operating system).">
This app cannot be uninstalled as it is part of Brave OS.
bsclifton marked this conversation as resolved.
Show resolved Hide resolved
</message>
<message name="IDS_APP_MANAGEMENT_POLICY_APP_POLICY_STRING" desc="Tooltip label explaining that an app cannot be uninstalled as it has been installed by an adminstrator.">
This app has been installed by your administrator.
</message>
</grit-part>
32 changes: 22 additions & 10 deletions app/bookmarks_strings.grdp
Original file line number Diff line number Diff line change
Expand Up @@ -359,9 +359,18 @@
<message name="IDS_BOOKMARK_MANAGER_MENU_ADD_FOLDER" desc="Title of the bookmark toolbar dropdown menu item that adds a new folder.">
Add new folder
</message>
<message name="IDS_BOOKMARK_MANAGER_MENU_CUT" desc="Title of the bookmark dropdown menu item that cuts one or more bookmarks.">
Cut
</message>
<message name="IDS_BOOKMARK_MANAGER_MENU_COPY" desc="Title of the bookmark dropdown menu item that copies one or more bookmarks.">
Copy
</message>
<message name="IDS_BOOKMARK_MANAGER_MENU_COPY_URL" desc="Title of the bookmark dropdown menu item that copies the url of the bookmark.">
Copy URL
</message>
<message name="IDS_BOOKMARK_MANAGER_MENU_PASTE" desc="Title of the bookmark dropdown menu item that pastes one or more bookmarks.">
Paste
</message>
<message name="IDS_BOOKMARK_MANAGER_MENU_EXPORT" desc="Title of the bookmark toolbar dropdown menu item that exports bookmarks.">
Export bookmarks
</message>
Expand Down Expand Up @@ -404,6 +413,9 @@
<message name="IDS_BOOKMARK_MANAGER_MORE_ACTIONS_AX_LABEL" desc="Spoken text for the button in the bookmark manager which shows an action menu for a bookmark, with actions like 'Edit' or 'Delete'">
More actions for <ph name="BOOKMARK_NAME">$1<ex>Bookmark X</ex></ph>
</message>
<message name="IDS_BOOKMARK_MANAGER_MORE_ACTIONS_MULTI_AX_LABEL" desc="Spoken text for the button in the bookmark manager which shows an action menu for multiple selected bookmarks, with actions like 'Cut' or 'Delete'">
More actions for selected items
</message>
<message name="IDS_BOOKMARK_MANAGER_OPEN_DIALOG_TITLE" desc="Title of the dialog confirming whether a large number of bookmarks should be opened.">
Open selected items
</message>
Expand Down Expand Up @@ -445,30 +457,30 @@
&amp;Bookmarks
</message>
<if expr="not use_titlecase">
<message name="IDS_BOOKMARK_THIS_PAGE" desc="Title of the menu item that bookmarks the current page.">
Bookmark this page...
<message name="IDS_BOOKMARK_THIS_TAB" desc="Title of the menu item that bookmarks the current tab.">
Bookmark this tab...
</message>
</if>
<if expr="use_titlecase">
<message name="IDS_BOOKMARK_THIS_PAGE" desc="In Title Case: Title of the menu item that bookmarks the current page.">
Bookmark This Page...
<message name="IDS_BOOKMARK_THIS_TAB" desc="In Title Case: Title of the menu item that bookmarks the current tab.">
Bookmark This Tab...
</message>
</if>
<if expr="not use_titlecase">
<message name="IDS_BOOKMARK_OPEN_PAGES" desc="Title of the menu item that bookmarks all the pages opened in this window.">
Bookmark open pages...
<message name="IDS_BOOKMARK_ALL_TABS" desc="Title of the menu item that bookmarks all the tabs opened in this window.">
Bookmark all tabs...
</message>
</if>
<if expr="use_titlecase">
<message name="IDS_BOOKMARK_OPEN_PAGES" desc="In Title Case: Title of the menu item that bookmarks all the pages opened in this window.">
Bookmark Open Pages...
<message name="IDS_BOOKMARK_ALL_TABS" desc="In Title Case: Title of the menu item that bookmarks all the tabs opened in this window.">
Bookmark All Tabs...
</message>
</if>
<!-- End of Bookmarks Menu (in the Main Menu) strings. -->

<!-- Begin of Bookmark Star button strings. -->
<message name="IDS_TOOLTIP_STARRED" desc="The tooltip shown when you hover the star button in the right side of the location bar and the current page is bookmarked.">
Edit bookmark for this page
<message name="IDS_TOOLTIP_STARRED" desc="The tooltip shown when you hover the star button in the right side of the location bar and the current tab is bookmarked.">
Edit bookmark for this tab
</message>
<!-- End of Bookmark Star button strings. -->

Expand Down
1 change: 0 additions & 1 deletion app/brave_main_delegate.cc
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
command_line.AppendSwitch(switches::kEnableDomDistiller);
#endif
command_line.AppendSwitch(switches::kDisableDomainReliability);
command_line.AppendSwitch(switches::kDisableChromeGoogleURLTrackingClient);
mkarolin marked this conversation as resolved.
Show resolved Hide resolved
command_line.AppendSwitch(switches::kNoPings);

// Setting these to default values in Chromium to maintain parity
Expand Down
Loading