diff options
| author | brettw <brettw@chromium.org> | 2015-04-01 15:54:38 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-01 22:55:50 +0000 |
| commit | dacf4b43686accafdd2e9cf0c91f515147204d18 (patch) | |
| tree | f6c7c36375fe8b0c20216d40a4f66d903d56bffb /chrome/browser/prefs | |
| parent | a9373cadd74221c6aaa77ca5b5fc2e7e7f5c4ed7 (diff) | |
| download | chromium_src-dacf4b43686accafdd2e9cf0c91f515147204d18.zip chromium_src-dacf4b43686accafdd2e9cf0c91f515147204d18.tar.gz chromium_src-dacf4b43686accafdd2e9cf0c91f515147204d18.tar.bz2 | |
Clear wallet data when sync is disabled.
Stop syncing (and therefore clear) wallet data when wallet autofill is disabled in the autofill settings dialog.
Stop re-masking cards on shutdown. Now masked and unmasked cards and addresses are deleted and not repopulated when the wallet integration is disabled.
Deleted an unused registrar class from the PrefMetricsService I noticed when researching this.
BUG=469847,462787,450843
Review URL: https://codereview.chromium.org/1046023002
Cr-Commit-Position: refs/heads/master@{#323354}
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/pref_metrics_service.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/prefs/pref_metrics_service.h b/chrome/browser/prefs/pref_metrics_service.h index 0335817..f7f7ff4 100644 --- a/chrome/browser/prefs/pref_metrics_service.h +++ b/chrome/browser/prefs/pref_metrics_service.h @@ -11,7 +11,6 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h" -#include "base/prefs/pref_change_registrar.h" #include "chrome/browser/prefs/synced_pref_change_registrar.h" #include "chrome/browser/profiles/profile.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" @@ -84,7 +83,6 @@ class PrefMetricsService : public KeyedService { PrefService* prefs_; PrefService* local_state_; - PrefChangeRegistrar pref_registrar_; scoped_ptr<SyncedPrefChangeRegistrar> synced_pref_change_registrar_; base::WeakPtrFactory<PrefMetricsService> weak_factory_; |