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

Side by Side Diff: chrome/browser/supervised_user/supervised_user_sync_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_SYNC_SERVICE_H_ 5 #ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SYNC_SERVICE_H_
6 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SYNC_SERVICE_H_ 6 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SYNC_SERVICE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 // syncing supervised users (i.e. has finished its initial merge of local and 100 // syncing supervised users (i.e. has finished its initial merge of local and
101 // server-side data, via MergeDataAndStartSyncing), as the stored data might 101 // server-side data, via MergeDataAndStartSyncing), as the stored data might
102 // be outdated before that. 102 // be outdated before that.
103 const base::DictionaryValue* GetSupervisedUsers(); 103 const base::DictionaryValue* GetSupervisedUsers();
104 104
105 // Calls the passed |callback| with a dictionary containing all supervised 105 // Calls the passed |callback| with a dictionary containing all supervised
106 // users managed by this custodian. 106 // users managed by this custodian.
107 void GetSupervisedUsersAsync(const SupervisedUsersCallback& callback); 107 void GetSupervisedUsersAsync(const SupervisedUsersCallback& callback);
108 108
109 // KeyedService implementation: 109 // KeyedService implementation:
110 virtual void Shutdown() OVERRIDE; 110 virtual void Shutdown() override;
111 111
112 // SyncableService implementation: 112 // SyncableService implementation:
113 virtual syncer::SyncMergeResult MergeDataAndStartSyncing( 113 virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
114 syncer::ModelType type, 114 syncer::ModelType type,
115 const syncer::SyncDataList& initial_sync_data, 115 const syncer::SyncDataList& initial_sync_data,
116 scoped_ptr<syncer::SyncChangeProcessor> sync_processor, 116 scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
117 scoped_ptr<syncer::SyncErrorFactory> error_handler) OVERRIDE; 117 scoped_ptr<syncer::SyncErrorFactory> error_handler) override;
118 virtual void StopSyncing(syncer::ModelType type) OVERRIDE; 118 virtual void StopSyncing(syncer::ModelType type) override;
119 virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const 119 virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const
120 OVERRIDE; 120 override;
121 virtual syncer::SyncError ProcessSyncChanges( 121 virtual syncer::SyncError ProcessSyncChanges(
122 const tracked_objects::Location& from_here, 122 const tracked_objects::Location& from_here,
123 const syncer::SyncChangeList& change_list) OVERRIDE; 123 const syncer::SyncChangeList& change_list) override;
124 124
125 private: 125 private:
126 friend class SupervisedUserSyncServiceFactory; 126 friend class SupervisedUserSyncServiceFactory;
127 127
128 // Use |SupervisedUserSyncServiceFactory::GetForProfile(...)| to get an 128 // Use |SupervisedUserSyncServiceFactory::GetForProfile(...)| to get an
129 // instance of this service. 129 // instance of this service.
130 explicit SupervisedUserSyncService(PrefService* prefs); 130 explicit SupervisedUserSyncService(PrefService* prefs);
131 131
132 void OnLastSignedInUsernameChange(); 132 void OnLastSignedInUsernameChange();
133 133
(...skipping 25 matching lines...) Expand all
159 scoped_ptr<syncer::SyncErrorFactory> error_handler_; 159 scoped_ptr<syncer::SyncErrorFactory> error_handler_;
160 160
161 ObserverList<SupervisedUserSyncServiceObserver> observers_; 161 ObserverList<SupervisedUserSyncServiceObserver> observers_;
162 162
163 std::vector<SupervisedUsersCallback> callbacks_; 163 std::vector<SupervisedUsersCallback> callbacks_;
164 164
165 DISALLOW_COPY_AND_ASSIGN(SupervisedUserSyncService); 165 DISALLOW_COPY_AND_ASSIGN(SupervisedUserSyncService);
166 }; 166 };
167 167
168 #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SYNC_SERVICE_H_ 168 #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SYNC_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698