Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(570)

Side by Side Diff: chrome/browser/prefs/profile_pref_store_manager.h

Issue 220203011: Changes requested by gab for previously committed CLs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_PREFS_PROFILE_PREF_STORE_MANAGER_H_ 5 #ifndef CHROME_BROWSER_PREFS_PROFILE_PREF_STORE_MANAGER_H_
6 #define CHROME_BROWSER_PREFS_PROFILE_PREF_STORE_MANAGER_H_ 6 #define CHROME_BROWSER_PREFS_PROFILE_PREF_STORE_MANAGER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 // Returns true on success. 97 // Returns true on success.
98 bool InitializePrefsFromMasterPrefs( 98 bool InitializePrefsFromMasterPrefs(
99 const base::DictionaryValue& master_prefs); 99 const base::DictionaryValue& master_prefs);
100 100
101 // Creates a single-file PrefStore as was used in M34 and earlier. Used only 101 // Creates a single-file PrefStore as was used in M34 and earlier. Used only
102 // for testing migration. 102 // for testing migration.
103 PersistentPrefStore* CreateDeprecatedCombinedProfilePrefStore( 103 PersistentPrefStore* CreateDeprecatedCombinedProfilePrefStore(
104 const scoped_refptr<base::SequencedTaskRunner>& io_task_runner); 104 const scoped_refptr<base::SequencedTaskRunner>& io_task_runner);
105 105
106 private: 106 private:
107 class InitializeHashStoreObserver;
108
109 // Returns a PrefHashStoreImpl for the managed profile. Should only be called 107 // Returns a PrefHashStoreImpl for the managed profile. Should only be called
110 // if |kPlatformSupportsPreferenceTracking|. 108 // if |kPlatformSupportsPreferenceTracking|.
111 scoped_ptr<PrefHashStoreImpl> GetPrefHashStoreImpl(); 109 scoped_ptr<PrefHashStoreImpl> GetPrefHashStoreImpl();
112 110
113 // Returns a PrefHashStore that is a copy of the current state of the real 111 // Returns a PrefHashStore that is a copy of the current state of the real
114 // hash store. 112 // hash store.
115 scoped_ptr<PrefHashStore> CopyPrefHashStore(); 113 scoped_ptr<PrefHashStore> CopyPrefHashStore();
116 114
117 const base::FilePath profile_path_; 115 const base::FilePath profile_path_;
118 const std::vector<PrefHashFilter::TrackedPreferenceMetadata> 116 const std::vector<PrefHashFilter::TrackedPreferenceMetadata>
119 tracking_configuration_; 117 tracking_configuration_;
120 const size_t reporting_ids_count_; 118 const size_t reporting_ids_count_;
121 const std::string seed_; 119 const std::string seed_;
122 const std::string device_id_; 120 const std::string device_id_;
123 PrefService* local_state_; 121 PrefService* local_state_;
124 122
125 DISALLOW_COPY_AND_ASSIGN(ProfilePrefStoreManager); 123 DISALLOW_COPY_AND_ASSIGN(ProfilePrefStoreManager);
126 }; 124 };
127 125
128 #endif // CHROME_BROWSER_PREFS_PROFILE_PREF_STORE_MANAGER_H_ 126 #endif // CHROME_BROWSER_PREFS_PROFILE_PREF_STORE_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698