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

Side by Side Diff: chrome/browser/supervised_user/supervised_user_settings_service.h

Issue 629603002: replace OVERRIDE and FINAL with override and final in chrome/browser/[r-z]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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
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_SUPERVISED_USER_SUPERVISED_USER_SETTINGS_SERVICE_H_ 5 #ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SETTINGS_SERVICE_H_
6 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SETTINGS_SERVICE_H_ 6 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SETTINGS_SERVICE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 102
103 // Sets the setting with the given |key| to a copy of the given |value|. 103 // Sets the setting with the given |key| to a copy of the given |value|.
104 void SetLocalSettingForTesting(const std::string& key, 104 void SetLocalSettingForTesting(const std::string& key,
105 scoped_ptr<base::Value> value); 105 scoped_ptr<base::Value> value);
106 106
107 // Public for testing. 107 // Public for testing.
108 static syncer::SyncData CreateSyncDataForSetting(const std::string& name, 108 static syncer::SyncData CreateSyncDataForSetting(const std::string& name,
109 const base::Value& value); 109 const base::Value& value);
110 110
111 // KeyedService implementation: 111 // KeyedService implementation:
112 virtual void Shutdown() OVERRIDE; 112 virtual void Shutdown() override;
113 113
114 // SyncableService implementation: 114 // SyncableService implementation:
115 virtual syncer::SyncMergeResult MergeDataAndStartSyncing( 115 virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
116 syncer::ModelType type, 116 syncer::ModelType type,
117 const syncer::SyncDataList& initial_sync_data, 117 const syncer::SyncDataList& initial_sync_data,
118 scoped_ptr<syncer::SyncChangeProcessor> sync_processor, 118 scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
119 scoped_ptr<syncer::SyncErrorFactory> error_handler) OVERRIDE; 119 scoped_ptr<syncer::SyncErrorFactory> error_handler) override;
120 virtual void StopSyncing(syncer::ModelType type) OVERRIDE; 120 virtual void StopSyncing(syncer::ModelType type) override;
121 virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const 121 virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const
122 OVERRIDE; 122 override;
123 virtual syncer::SyncError ProcessSyncChanges( 123 virtual syncer::SyncError ProcessSyncChanges(
124 const tracked_objects::Location& from_here, 124 const tracked_objects::Location& from_here,
125 const syncer::SyncChangeList& change_list) OVERRIDE; 125 const syncer::SyncChangeList& change_list) override;
126 126
127 // PrefStore::Observer implementation: 127 // PrefStore::Observer implementation:
128 virtual void OnPrefValueChanged(const std::string& key) OVERRIDE; 128 virtual void OnPrefValueChanged(const std::string& key) override;
129 virtual void OnInitializationCompleted(bool success) OVERRIDE; 129 virtual void OnInitializationCompleted(bool success) override;
130 130
131 private: 131 private:
132 base::DictionaryValue* GetOrCreateDictionary(const std::string& key) const; 132 base::DictionaryValue* GetOrCreateDictionary(const std::string& key) const;
133 base::DictionaryValue* GetAtomicSettings() const; 133 base::DictionaryValue* GetAtomicSettings() const;
134 base::DictionaryValue* GetSplitSettings() const; 134 base::DictionaryValue* GetSplitSettings() const;
135 base::DictionaryValue* GetQueuedItems() const; 135 base::DictionaryValue* GetQueuedItems() const;
136 136
137 // Returns the dictionary where a given Sync item should be stored, depending 137 // Returns the dictionary where a given Sync item should be stored, depending
138 // on whether the supervised user setting is atomic or split. In case of a 138 // on whether the supervised user setting is atomic or split. In case of a
139 // split setting, the split setting prefix of |key| is removed, so that |key| 139 // split setting, the split setting prefix of |key| is removed, so that |key|
(...skipping 19 matching lines...) Expand all
159 159
160 std::vector<SettingsCallback> subscribers_; 160 std::vector<SettingsCallback> subscribers_;
161 161
162 scoped_ptr<syncer::SyncChangeProcessor> sync_processor_; 162 scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
163 scoped_ptr<syncer::SyncErrorFactory> error_handler_; 163 scoped_ptr<syncer::SyncErrorFactory> error_handler_;
164 164
165 DISALLOW_COPY_AND_ASSIGN(SupervisedUserSettingsService); 165 DISALLOW_COPY_AND_ASSIGN(SupervisedUserSettingsService);
166 }; 166 };
167 167
168 #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SETTINGS_SERVICE_H_ 168 #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SETTINGS_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698