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

Side by Side Diff: components/password_manager/core/browser/password_syncable_service.h

Issue 616283002: Revert "Replace OVERRIDE with its C++11 counterpart in components/password_manager/" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_SYNCABLE_SERVICE_H__ 5 #ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_SYNCABLE_SERVICE_H__
6 #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_SYNCABLE_SERVICE_H__ 6 #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_SYNCABLE_SERVICE_H__
7 7
8 #if !defined(PASSWORD_MANAGER_ENABLE_SYNC) 8 #if !defined(PASSWORD_MANAGER_ENABLE_SYNC)
9 #error "Only build this file when sync is enabled in Password Manager." 9 #error "Only build this file when sync is enabled in Password Manager."
10 #endif 10 #endif
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 // |password_store|, the constructor doesn't take ownership of the 42 // |password_store|, the constructor doesn't take ownership of the
43 // |password_store|. 43 // |password_store|.
44 explicit PasswordSyncableService(PasswordStoreSync* password_store); 44 explicit PasswordSyncableService(PasswordStoreSync* password_store);
45 virtual ~PasswordSyncableService(); 45 virtual ~PasswordSyncableService();
46 46
47 // syncer::SyncableService: 47 // syncer::SyncableService:
48 virtual syncer::SyncMergeResult MergeDataAndStartSyncing( 48 virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
49 syncer::ModelType type, 49 syncer::ModelType type,
50 const syncer::SyncDataList& initial_sync_data, 50 const syncer::SyncDataList& initial_sync_data,
51 scoped_ptr<syncer::SyncChangeProcessor> sync_processor, 51 scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
52 scoped_ptr<syncer::SyncErrorFactory> error_handler) override; 52 scoped_ptr<syncer::SyncErrorFactory> error_handler) OVERRIDE;
53 virtual void StopSyncing(syncer::ModelType type) override; 53 virtual void StopSyncing(syncer::ModelType type) OVERRIDE;
54 virtual syncer::SyncDataList GetAllSyncData( 54 virtual syncer::SyncDataList GetAllSyncData(
55 syncer::ModelType type) const override; 55 syncer::ModelType type) const OVERRIDE;
56 virtual syncer::SyncError ProcessSyncChanges( 56 virtual syncer::SyncError ProcessSyncChanges(
57 const tracked_objects::Location& from_here, 57 const tracked_objects::Location& from_here,
58 const syncer::SyncChangeList& change_list) override; 58 const syncer::SyncChangeList& change_list) OVERRIDE;
59 59
60 // Notifies the Sync engine of changes to the password database. 60 // Notifies the Sync engine of changes to the password database.
61 void ActOnPasswordStoreChanges(const PasswordStoreChangeList& changes); 61 void ActOnPasswordStoreChanges(const PasswordStoreChangeList& changes);
62 62
63 // Provides a StartSyncFlare to the SyncableService. See 63 // Provides a StartSyncFlare to the SyncableService. See
64 // chrome/browser/sync/glue/sync_start_util.h for more. 64 // chrome/browser/sync/glue/sync_start_util.h for more.
65 void InjectStartSyncFlare( 65 void InjectStartSyncFlare(
66 const syncer::SyncableService::StartSyncFlare& flare); 66 const syncer::SyncableService::StartSyncFlare& flare);
67 67
68 private: 68 private:
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 117
118 // True if processing sync changes is in progress. 118 // True if processing sync changes is in progress.
119 bool is_processing_sync_changes_; 119 bool is_processing_sync_changes_;
120 120
121 DISALLOW_COPY_AND_ASSIGN(PasswordSyncableService); 121 DISALLOW_COPY_AND_ASSIGN(PasswordSyncableService);
122 }; 122 };
123 123
124 } // namespace password_manager 124 } // namespace password_manager
125 125
126 #endif // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_SYNCABLE_SERVICE_H_ _ 126 #endif // COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_PASSWORD_SYNCABLE_SERVICE_H_ _
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698