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

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

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_PREF_SERVICE_SYNCABLE_H_ 5 #ifndef CHROME_BROWSER_PREFS_PREF_SERVICE_SYNCABLE_H_
6 #define CHROME_BROWSER_PREFS_PREF_SERVICE_SYNCABLE_H_ 6 #define CHROME_BROWSER_PREFS_PREF_SERVICE_SYNCABLE_H_
7 7
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "chrome/browser/prefs/pref_model_associator.h" 9 #include "chrome/browser/prefs/pref_model_associator.h"
10 #include "chrome/browser/prefs/synced_pref_observer.h" 10 #include "chrome/browser/prefs/synced_pref_observer.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 bool IsPrefSynced(const std::string& name) const; 72 bool IsPrefSynced(const std::string& name) const;
73 73
74 void AddObserver(PrefServiceSyncableObserver* observer); 74 void AddObserver(PrefServiceSyncableObserver* observer);
75 void RemoveObserver(PrefServiceSyncableObserver* observer); 75 void RemoveObserver(PrefServiceSyncableObserver* observer);
76 76
77 // TODO(zea): Have PrefServiceSyncable implement 77 // TODO(zea): Have PrefServiceSyncable implement
78 // syncer::SyncableService directly. 78 // syncer::SyncableService directly.
79 syncer::SyncableService* GetSyncableService(const syncer::ModelType& type); 79 syncer::SyncableService* GetSyncableService(const syncer::ModelType& type);
80 80
81 // Do not call this after having derived an incognito or per tab pref service. 81 // Do not call this after having derived an incognito or per tab pref service.
82 virtual void UpdateCommandLinePrefStore(PrefStore* cmd_line_store) OVERRIDE; 82 virtual void UpdateCommandLinePrefStore(PrefStore* cmd_line_store) override;
83 83
84 void AddSyncedPrefObserver(const std::string& name, 84 void AddSyncedPrefObserver(const std::string& name,
85 SyncedPrefObserver* observer); 85 SyncedPrefObserver* observer);
86 void RemoveSyncedPrefObserver(const std::string& name, 86 void RemoveSyncedPrefObserver(const std::string& name,
87 SyncedPrefObserver* observer); 87 SyncedPrefObserver* observer);
88 88
89 private: 89 private:
90 friend class PrefModelAssociator; 90 friend class PrefModelAssociator;
91 91
92 void AddRegisteredSyncablePreference( 92 void AddRegisteredSyncablePreference(
(...skipping 13 matching lines...) Expand all
106 106
107 PrefModelAssociator pref_sync_associator_; 107 PrefModelAssociator pref_sync_associator_;
108 PrefModelAssociator priority_pref_sync_associator_; 108 PrefModelAssociator priority_pref_sync_associator_;
109 109
110 ObserverList<PrefServiceSyncableObserver> observer_list_; 110 ObserverList<PrefServiceSyncableObserver> observer_list_;
111 111
112 DISALLOW_COPY_AND_ASSIGN(PrefServiceSyncable); 112 DISALLOW_COPY_AND_ASSIGN(PrefServiceSyncable);
113 }; 113 };
114 114
115 #endif // CHROME_BROWSER_PREFS_PREF_SERVICE_SYNCABLE_H_ 115 #endif // CHROME_BROWSER_PREFS_PREF_SERVICE_SYNCABLE_H_
OLDNEW
« no previous file with comments | « chrome/browser/prefs/pref_service_browsertest.cc ('k') | chrome/browser/prefs/prefs_syncable_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698