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

Side by Side Diff: sync/sessions/model_type_registry.h

Issue 629733002: replace OVERRIDE and FINAL with override and final in sync/ (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
« no previous file with comments | « sync/js/sync_js_controller.h ('k') | sync/sessions/model_type_registry.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 SYNC_ENGINE_MODEL_TYPE_REGISTRY_H_ 5 #ifndef SYNC_ENGINE_MODEL_TYPE_REGISTRY_H_
6 #define SYNC_ENGINE_MODEL_TYPE_REGISTRY_H_ 6 #define SYNC_ENGINE_MODEL_TYPE_REGISTRY_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 // Enables an off-thread type for syncing. Connects the given proxy 56 // Enables an off-thread type for syncing. Connects the given proxy
57 // and its task_runner to the newly created worker. 57 // and its task_runner to the newly created worker.
58 // 58 //
59 // Expects that the proxy's ModelType is not currently enabled. 59 // Expects that the proxy's ModelType is not currently enabled.
60 virtual void ConnectSyncTypeToWorker( 60 virtual void ConnectSyncTypeToWorker(
61 syncer::ModelType type, 61 syncer::ModelType type,
62 const DataTypeState& data_type_state, 62 const DataTypeState& data_type_state,
63 const syncer::UpdateResponseDataList& saved_pending_updates, 63 const syncer::UpdateResponseDataList& saved_pending_updates,
64 const scoped_refptr<base::SequencedTaskRunner>& type_task_runner, 64 const scoped_refptr<base::SequencedTaskRunner>& type_task_runner,
65 const base::WeakPtr<ModelTypeSyncProxyImpl>& proxy) OVERRIDE; 65 const base::WeakPtr<ModelTypeSyncProxyImpl>& proxy) override;
66 66
67 // Disables the syncing of an off-thread type. 67 // Disables the syncing of an off-thread type.
68 // 68 //
69 // Expects that the type is currently enabled. 69 // Expects that the type is currently enabled.
70 // Deletes the worker associated with the type. 70 // Deletes the worker associated with the type.
71 virtual void DisconnectSyncWorker(syncer::ModelType type) OVERRIDE; 71 virtual void DisconnectSyncWorker(syncer::ModelType type) override;
72 72
73 // Implementation of SyncEncryptionHandler::Observer. 73 // Implementation of SyncEncryptionHandler::Observer.
74 virtual void OnPassphraseRequired( 74 virtual void OnPassphraseRequired(
75 PassphraseRequiredReason reason, 75 PassphraseRequiredReason reason,
76 const sync_pb::EncryptedData& pending_keys) OVERRIDE; 76 const sync_pb::EncryptedData& pending_keys) override;
77 virtual void OnPassphraseAccepted() OVERRIDE; 77 virtual void OnPassphraseAccepted() override;
78 virtual void OnBootstrapTokenUpdated(const std::string& bootstrap_token, 78 virtual void OnBootstrapTokenUpdated(const std::string& bootstrap_token,
79 BootstrapTokenType type) OVERRIDE; 79 BootstrapTokenType type) override;
80 virtual void OnEncryptedTypesChanged(ModelTypeSet encrypted_types, 80 virtual void OnEncryptedTypesChanged(ModelTypeSet encrypted_types,
81 bool encrypt_everything) OVERRIDE; 81 bool encrypt_everything) override;
82 virtual void OnEncryptionComplete() OVERRIDE; 82 virtual void OnEncryptionComplete() override;
83 virtual void OnCryptographerStateChanged( 83 virtual void OnCryptographerStateChanged(
84 Cryptographer* cryptographer) OVERRIDE; 84 Cryptographer* cryptographer) override;
85 virtual void OnPassphraseTypeChanged(PassphraseType type, 85 virtual void OnPassphraseTypeChanged(PassphraseType type,
86 base::Time passphrase_time) OVERRIDE; 86 base::Time passphrase_time) override;
87 87
88 // Gets the set of enabled types. 88 // Gets the set of enabled types.
89 ModelTypeSet GetEnabledTypes() const; 89 ModelTypeSet GetEnabledTypes() const;
90 90
91 // Simple getters. 91 // Simple getters.
92 UpdateHandlerMap* update_handler_map(); 92 UpdateHandlerMap* update_handler_map();
93 CommitContributorMap* commit_contributor_map(); 93 CommitContributorMap* commit_contributor_map();
94 DirectoryTypeDebugInfoEmitterMap* directory_type_debug_info_emitter_map(); 94 DirectoryTypeDebugInfoEmitterMap* directory_type_debug_info_emitter_map();
95 95
96 void RegisterDirectoryTypeDebugInfoObserver( 96 void RegisterDirectoryTypeDebugInfoObserver(
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 ObserverList<TypeDebugInfoObserver> type_debug_info_observers_; 157 ObserverList<TypeDebugInfoObserver> type_debug_info_observers_;
158 158
159 base::WeakPtrFactory<ModelTypeRegistry> weak_ptr_factory_; 159 base::WeakPtrFactory<ModelTypeRegistry> weak_ptr_factory_;
160 160
161 DISALLOW_COPY_AND_ASSIGN(ModelTypeRegistry); 161 DISALLOW_COPY_AND_ASSIGN(ModelTypeRegistry);
162 }; 162 };
163 163
164 } // namespace syncer 164 } // namespace syncer
165 165
166 #endif // SYNC_ENGINE_MODEL_TYPE_REGISTRY_H_ 166 #endif // SYNC_ENGINE_MODEL_TYPE_REGISTRY_H_
OLDNEW
« no previous file with comments | « sync/js/sync_js_controller.h ('k') | sync/sessions/model_type_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698