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

Side by Side Diff: chrome/browser/supervised_user/supervised_user_shared_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_SHARED_SETTINGS_SERVICE_H _ 5 #ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SHARED_SETTINGS_SERVICE_H _
6 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SHARED_SETTINGS_SERVICE_H _ 6 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SHARED_SETTINGS_SERVICE_H _
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 const base::Value& value, 82 const base::Value& value,
83 bool acknowledged); 83 bool acknowledged);
84 84
85 // Public for testing. 85 // Public for testing.
86 static syncer::SyncData CreateSyncDataForSetting(const std::string& su_id, 86 static syncer::SyncData CreateSyncDataForSetting(const std::string& su_id,
87 const std::string& key, 87 const std::string& key,
88 const base::Value& value, 88 const base::Value& value,
89 bool acknowledged); 89 bool acknowledged);
90 90
91 // KeyedService implementation: 91 // KeyedService implementation:
92 virtual void Shutdown() OVERRIDE; 92 virtual void Shutdown() override;
93 93
94 // SyncableService implementation: 94 // SyncableService implementation:
95 virtual syncer::SyncMergeResult MergeDataAndStartSyncing( 95 virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
96 syncer::ModelType type, 96 syncer::ModelType type,
97 const syncer::SyncDataList& initial_sync_data, 97 const syncer::SyncDataList& initial_sync_data,
98 scoped_ptr<syncer::SyncChangeProcessor> sync_processor, 98 scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
99 scoped_ptr<syncer::SyncErrorFactory> error_handler) OVERRIDE; 99 scoped_ptr<syncer::SyncErrorFactory> error_handler) override;
100 virtual void StopSyncing(syncer::ModelType type) OVERRIDE; 100 virtual void StopSyncing(syncer::ModelType type) override;
101 virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const 101 virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const
102 OVERRIDE; 102 override;
103 virtual syncer::SyncError ProcessSyncChanges( 103 virtual syncer::SyncError ProcessSyncChanges(
104 const tracked_objects::Location& from_here, 104 const tracked_objects::Location& from_here,
105 const syncer::SyncChangeList& change_list) OVERRIDE; 105 const syncer::SyncChangeList& change_list) override;
106 106
107 private: 107 private:
108 scoped_ptr<syncer::SyncChangeProcessor> sync_processor_; 108 scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
109 scoped_ptr<syncer::SyncErrorFactory> error_handler_; 109 scoped_ptr<syncer::SyncErrorFactory> error_handler_;
110 110
111 ChangeCallbackList callbacks_; 111 ChangeCallbackList callbacks_;
112 112
113 PrefService* prefs_; 113 PrefService* prefs_;
114 }; 114 };
115 115
116 #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SHARED_SETTINGS_SERVIC E_H_ 116 #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SHARED_SETTINGS_SERVIC E_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698