|
@@ -55,7 +55,7 @@
|
|
|
#include "components/signin/public/base/signin_pref_names.h"
|
|
|
#include "components/translate/core/browser/translate_pref_names.h"
|
|
|
|
|
|
-@@ -95,8 +94,6 @@ const char* const kPrefsExposedToJava[]
|
|
|
+@@ -95,8 +94,6 @@ const char* const kPrefsExposedToJava[]
|
|
|
autofill::prefs::kAutofillCreditCardEnabled,
|
|
|
prefs::kUsageStatsEnabled,
|
|
|
offline_pages::prefetch_prefs::kUserSettingEnabled,
|
|
@@ -159,7 +159,7 @@
|
|
|
|
|
|
if (prefs->GetBoolean(prefs::kPrintPreviewDisabled))
|
|
|
command_line->AppendSwitch(switches::kDisablePrintPreview);
|
|
|
-@@ -4290,7 +4284,7 @@ ChromeContentBrowserClient::CreateURLLoa
|
|
|
+@@ -4292,7 +4286,7 @@ ChromeContentBrowserClient::CreateURLLoa
|
|
|
|
|
|
signin::IdentityManager* identity_manager =
|
|
|
IdentityManagerFactory::GetForProfile(profile);
|
|
@@ -337,7 +337,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"
|
|
|
-@@ -114,11 +113,6 @@ const PrefMappingEntry kPrefMapping[] =
|
|
|
+@@ -114,11 +113,6 @@ const PrefMappingEntry kPrefMapping[] =
|
|
|
APIPermission::kPrivacy},
|
|
|
{"doNotTrackEnabled", prefs::kEnableDoNotTrack, APIPermission::kPrivacy,
|
|
|
APIPermission::kPrivacy},
|
|
@@ -1335,7 +1335,7 @@
|
|
|
RequestOutcome* reason) const {
|
|
|
--- a/chrome/browser/safe_browsing/chrome_password_protection_service.h
|
|
|
+++ b/chrome/browser/safe_browsing/chrome_password_protection_service.h
|
|
|
-@@ -217,13 +217,6 @@ class ChromePasswordProtectionService :
|
|
|
+@@ -217,13 +217,6 @@ class ChromePasswordProtectionService :
|
|
|
bool UserClickedThroughSBInterstitial(
|
|
|
content::WebContents* web_contents) override;
|
|
|
|
|
@@ -2067,7 +2067,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_;
|
|
@@ -2562,7 +2562,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);
|
|
@@ -4120,7 +4120,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_;
|
|
|
|
|
@@ -4352,7 +4352,7 @@
|
|
|
#include "components/sync_preferences/testing_pref_service_syncable.h"
|
|
|
--- a/tools/metrics/histograms/enums.xml
|
|
|
+++ b/tools/metrics/histograms/enums.xml
|
|
|
-@@ -64148,7 +64148,6 @@ Full version information for the fingerp
|
|
|
+@@ -64150,7 +64150,6 @@ Full version information for the fingerp
|
|
|
<int value="3" label="kRestoreOnStartup"/>
|
|
|
<int value="4" label="kURLsToRestoreOnStartup"/>
|
|
|
<int value="5" label="extensions::pref_names::kExtensions"/>
|
|
@@ -4360,7 +4360,7 @@
|
|
|
<int value="7" label="kSearchProviderOverrides"/>
|
|
|
<int value="8" label="kDefaultSearchProviderSearchURL (Obsolete 12/2016)"/>
|
|
|
<int value="9" label="kDefaultSearchProviderKeyword (Obsolete 12/2016)"/>
|
|
|
-@@ -64163,10 +64162,7 @@ Full version information for the fingerp
|
|
|
+@@ -64165,10 +64164,7 @@ Full version information for the fingerp
|
|
|
<int value="18" label="kSafeBrowsingIncidentsSent"/>
|
|
|
<int value="19" label="kSwReporterPromptVersion"/>
|
|
|
<int value="20" label="kSwReporterPromptReason"/>
|