summaryrefslogtreecommitdiffstats
path: root/chrome/common/json_pref_store.h
diff options
context:
space:
mode:
authoraltimofeev@chromium.org <altimofeev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-13 12:23:53 +0000
committeraltimofeev@chromium.org <altimofeev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-13 12:23:53 +0000
commite4f864978d24e79ed3a47142c3a146d09627d0d4 (patch)
treee8f0bf5ef24b7263f448a1b5a853083096249e4b /chrome/common/json_pref_store.h
parentd139f87c7ede1b35c906b32c77e363da4c87bf74 (diff)
downloadchromium_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/common/json_pref_store.h')
-rw-r--r--chrome/common/json_pref_store.h13
1 files changed, 0 insertions, 13 deletions
diff --git a/chrome/common/json_pref_store.h b/chrome/common/json_pref_store.h
index d8da37d..b2a1f53 100644
--- a/chrome/common/json_pref_store.h
+++ b/chrome/common/json_pref_store.h
@@ -27,11 +27,6 @@ class Value;
class JsonPrefStore : public PersistentPrefStore,
public ImportantFileWriter::DataSerializer {
public:
- class Delegate {
- public:
- virtual void OnPrefsRead(PrefReadError error, bool no_dir) = 0;
- };
-
// |file_message_loop_proxy| is the MessageLoopProxy for a thread on which
// file I/O can be done.
JsonPrefStore(const FilePath& pref_filename,
@@ -51,17 +46,11 @@ class JsonPrefStore : public PersistentPrefStore,
virtual void RemoveValue(const std::string& key);
virtual bool ReadOnly() const;
virtual PrefReadError ReadPrefs();
- // todo(altimofeev): move it to the PersistentPrefStore inteface.
- void ReadPrefs(Delegate* delegate);
virtual bool WritePrefs();
virtual void ScheduleWritePrefs();
virtual void CommitPendingWrite();
virtual void ReportValueChanged(const std::string& key);
- // This method is called after JSON file has been read. Method takes
- // ownership of the |value| pointer.
- void OnFileRead(Value* value_owned, PrefReadError error, bool no_dir);
-
private:
// ImportantFileWriter::DataSerializer overrides:
virtual bool SerializeData(std::string* output);
@@ -77,8 +66,6 @@ class JsonPrefStore : public PersistentPrefStore,
ObserverList<PrefStore::Observer, true> observers_;
- Delegate* delegate_;
-
DISALLOW_COPY_AND_ASSIGN(JsonPrefStore);
};