diff options
| author | altimofeev@chromium.org <altimofeev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-13 12:23:53 +0000 |
|---|---|---|
| committer | altimofeev@chromium.org <altimofeev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-13 12:23:53 +0000 |
| commit | e4f864978d24e79ed3a47142c3a146d09627d0d4 (patch) | |
| tree | e8f0bf5ef24b7263f448a1b5a853083096249e4b /chrome/browser/prefs/pref_service.h | |
| parent | d139f87c7ede1b35c906b32c77e363da4c87bf74 (diff) | |
| download | chromium_src-e4f864978d24e79ed3a47142c3a146d09627d0d4.zip chromium_src-e4f864978d24e79ed3a47142c3a146d09627d0d4.tar.gz chromium_src-e4f864978d24e79ed3a47142c3a146d09627d0d4.tar.bz2 | |
Revert 81394 (broke sync_integration_tests and clang) - This CL implements alternative asynchronous methods for profile and preferences loading.BUG=chromium-os:11104TEST=UserProfileGotten (see "/tmp/login-times-sent") time doesn't increase, while UI jankness decreases.Review URL: http://codereview.chromium.org/6716025
TBR=altimofeev@chromium.org
Review URL: http://codereview.chromium.org/6834021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/pref_service.h')
| -rw-r--r-- | chrome/browser/prefs/pref_service.h | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/chrome/browser/prefs/pref_service.h b/chrome/browser/prefs/pref_service.h index 59e4b51..690b8c2 100644 --- a/chrome/browser/prefs/pref_service.h +++ b/chrome/browser/prefs/pref_service.h @@ -15,7 +15,6 @@ #include "base/memory/scoped_ptr.h" #include "base/threading/non_thread_safe.h" #include "base/values.h" -#include "chrome/common/json_pref_store.h" class DefaultPrefStore; class FilePath; @@ -33,8 +32,7 @@ class PrefMemberBase; class ScopedUserPrefUpdateBase; }; -class PrefService : public base::NonThreadSafe, - public JsonPrefStore::Delegate { +class PrefService : public base::NonThreadSafe { public: // A helper class to store all the information associated with a preference. class Preference { @@ -113,15 +111,6 @@ class PrefService : public base::NonThreadSafe, DISALLOW_COPY_AND_ASSIGN(Preference); }; - class Delegate { - public: - virtual void OnPrefsLoaded(PrefService* prefs, bool success) = 0; - }; - - // JsonPrefStore::Delegate implementaion. - virtual void OnPrefsRead(PersistentPrefStore::PrefReadError error, - bool no_dir); - // Factory method that creates a new instance of a PrefService with the // applicable PrefStores. The |pref_filename| points to the user preference // file. The |profile| is the one to which these preferences apply; it may be @@ -133,12 +122,6 @@ class PrefService : public base::NonThreadSafe, PrefStore* extension_pref_store, Profile* profile); - // Same as above, but with async initialization. - static PrefService* CreatePrefServiceAsync(const FilePath& pref_filename, - PrefStore* extension_pref_store, - Profile* profile, - Delegate* delegate); - // Creates an incognito copy of the pref service that shares most pref stores // but uses a fresh non-persistent overlay for the user pref store and an // individual extension pref store (to cache the effective extension prefs for @@ -255,8 +238,7 @@ class PrefService : public base::NonThreadSafe, PersistentPrefStore* user_prefs, PrefStore* recommended_platform_prefs, PrefStore* recommended_cloud_prefs, - DefaultPrefStore* default_store, - Delegate* delegate); + DefaultPrefStore* default_store); // The PrefNotifier handles registering and notifying preference observers. // It is created and owned by this PrefService. Subclasses may access it for @@ -338,10 +320,6 @@ class PrefService : public base::NonThreadSafe, // of registered preferences are. mutable PreferenceSet prefs_; - // Holds delegator to be called after initialization, if async version - // is used. - Delegate* delegate_; - DISALLOW_COPY_AND_ASSIGN(PrefService); }; |