|
@@ -112,7 +112,7 @@
|
|
|
|
|
|
// A preference exposed to Java.
|
|
|
// A Java counterpart will be generated for this enum.
|
|
|
-@@ -69,8 +68,6 @@ const char* const kPrefsExposedToJava[]
|
|
|
+@@ -69,8 +68,6 @@ const char* const kPrefsExposedToJava[]
|
|
|
autofill::prefs::kAutofillCreditCardEnabled,
|
|
|
prefs::kUsageStatsEnabled,
|
|
|
offline_pages::prefetch_prefs::kUserSettingEnabled,
|
|
@@ -361,7 +361,7 @@
|
|
|
#include "components/spellcheck/browser/pref_names.h"
|
|
|
#include "components/translate/core/browser/translate_pref_names.h"
|
|
|
#include "extensions/browser/extension_pref_value_map.h"
|
|
|
-@@ -111,11 +110,6 @@ const PrefMappingEntry kPrefMapping[] =
|
|
|
+@@ -111,11 +110,6 @@ const PrefMappingEntry kPrefMapping[] =
|
|
|
APIPermission::kPrivacy},
|
|
|
{"doNotTrackEnabled", prefs::kEnableDoNotTrack, APIPermission::kPrivacy,
|
|
|
APIPermission::kPrivacy},
|
|
@@ -1223,7 +1223,7 @@
|
|
|
RequestOutcome* reason) const {
|
|
|
--- a/chrome/browser/safe_browsing/chrome_password_protection_service.h
|
|
|
+++ b/chrome/browser/safe_browsing/chrome_password_protection_service.h
|
|
|
-@@ -202,13 +202,6 @@ class ChromePasswordProtectionService :
|
|
|
+@@ -202,13 +202,6 @@ class ChromePasswordProtectionService :
|
|
|
bool UserClickedThroughSBInterstitial(
|
|
|
content::WebContents* web_contents) override;
|
|
|
|
|
@@ -2032,7 +2032,7 @@
|
|
|
// static
|
|
|
--- a/chrome/browser/ui/browser_command_controller.h
|
|
|
+++ b/chrome/browser/ui/browser_command_controller.h
|
|
|
-@@ -212,7 +212,6 @@ class BrowserCommandController : public
|
|
|
+@@ -212,7 +212,6 @@ class BrowserCommandController : public
|
|
|
|
|
|
PrefChangeRegistrar profile_pref_registrar_;
|
|
|
PrefChangeRegistrar local_pref_registrar_;
|
|
@@ -2513,7 +2513,7 @@
|
|
|
#include "components/strings/grit/components_strings.h"
|
|
|
#include "content/public/browser/web_ui.h"
|
|
|
#include "content/public/browser/web_ui_data_source.h"
|
|
|
-@@ -106,9 +105,7 @@ void SigninErrorUI::Initialize(Browser*
|
|
|
+@@ -106,9 +105,7 @@ void SigninErrorUI::Initialize(Browser*
|
|
|
if (is_profile_blocked) {
|
|
|
source->AddLocalizedString("profileBlockedMessage",
|
|
|
IDS_OLD_PROFILES_DISABLED_MESSAGE);
|
|
@@ -3985,7 +3985,7 @@
|
|
|
primary_account_manager->GetAuthenticatedAccountInfo();
|
|
|
--- a/components/signin/internal/identity_manager/primary_account_policy_manager_impl.h
|
|
|
+++ b/components/signin/internal/identity_manager/primary_account_policy_manager_impl.h
|
|
|
-@@ -50,9 +50,6 @@ class PrimaryAccountPolicyManagerImpl :
|
|
|
+@@ -50,9 +50,6 @@ class PrimaryAccountPolicyManagerImpl :
|
|
|
// profile-specific local prefs (like kGoogleServicesUsernamePattern).
|
|
|
PrefChangeRegistrar local_state_pref_registrar_;
|
|
|
|