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

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

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/sessions/model_type_registry.h ('k') | sync/sessions/model_type_registry_unittest.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 #include "sync/sessions/model_type_registry.h" 5 #include "sync/sessions/model_type_registry.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/observer_list.h" 8 #include "base/observer_list.h"
9 #include "base/thread_task_runner_handle.h" 9 #include "base/thread_task_runner_handle.h"
10 #include "sync/engine/directory_commit_contributor.h" 10 #include "sync/engine/directory_commit_contributor.h"
(...skipping 12 matching lines...) Expand all
23 23
24 class ModelTypeSyncProxyWrapper : public ModelTypeSyncProxy { 24 class ModelTypeSyncProxyWrapper : public ModelTypeSyncProxy {
25 public: 25 public:
26 ModelTypeSyncProxyWrapper( 26 ModelTypeSyncProxyWrapper(
27 const base::WeakPtr<ModelTypeSyncProxyImpl>& proxy, 27 const base::WeakPtr<ModelTypeSyncProxyImpl>& proxy,
28 const scoped_refptr<base::SequencedTaskRunner>& processor_task_runner); 28 const scoped_refptr<base::SequencedTaskRunner>& processor_task_runner);
29 virtual ~ModelTypeSyncProxyWrapper(); 29 virtual ~ModelTypeSyncProxyWrapper();
30 30
31 virtual void OnCommitCompleted( 31 virtual void OnCommitCompleted(
32 const DataTypeState& type_state, 32 const DataTypeState& type_state,
33 const CommitResponseDataList& response_list) OVERRIDE; 33 const CommitResponseDataList& response_list) override;
34 virtual void OnUpdateReceived( 34 virtual void OnUpdateReceived(
35 const DataTypeState& type_state, 35 const DataTypeState& type_state,
36 const UpdateResponseDataList& response_list, 36 const UpdateResponseDataList& response_list,
37 const UpdateResponseDataList& pending_updates) OVERRIDE; 37 const UpdateResponseDataList& pending_updates) override;
38 38
39 private: 39 private:
40 base::WeakPtr<ModelTypeSyncProxyImpl> processor_; 40 base::WeakPtr<ModelTypeSyncProxyImpl> processor_;
41 scoped_refptr<base::SequencedTaskRunner> processor_task_runner_; 41 scoped_refptr<base::SequencedTaskRunner> processor_task_runner_;
42 }; 42 };
43 43
44 ModelTypeSyncProxyWrapper::ModelTypeSyncProxyWrapper( 44 ModelTypeSyncProxyWrapper::ModelTypeSyncProxyWrapper(
45 const base::WeakPtr<ModelTypeSyncProxyImpl>& proxy, 45 const base::WeakPtr<ModelTypeSyncProxyImpl>& proxy,
46 const scoped_refptr<base::SequencedTaskRunner>& processor_task_runner) 46 const scoped_refptr<base::SequencedTaskRunner>& processor_task_runner)
47 : processor_(proxy), processor_task_runner_(processor_task_runner) { 47 : processor_(proxy), processor_task_runner_(processor_task_runner) {
(...skipping 26 matching lines...) Expand all
74 pending_updates)); 74 pending_updates));
75 } 75 }
76 76
77 class ModelTypeSyncWorkerWrapper : public ModelTypeSyncWorker { 77 class ModelTypeSyncWorkerWrapper : public ModelTypeSyncWorker {
78 public: 78 public:
79 ModelTypeSyncWorkerWrapper( 79 ModelTypeSyncWorkerWrapper(
80 const base::WeakPtr<ModelTypeSyncWorkerImpl>& worker, 80 const base::WeakPtr<ModelTypeSyncWorkerImpl>& worker,
81 const scoped_refptr<base::SequencedTaskRunner>& sync_thread); 81 const scoped_refptr<base::SequencedTaskRunner>& sync_thread);
82 virtual ~ModelTypeSyncWorkerWrapper(); 82 virtual ~ModelTypeSyncWorkerWrapper();
83 83
84 virtual void EnqueueForCommit(const CommitRequestDataList& list) OVERRIDE; 84 virtual void EnqueueForCommit(const CommitRequestDataList& list) override;
85 85
86 private: 86 private:
87 base::WeakPtr<ModelTypeSyncWorkerImpl> worker_; 87 base::WeakPtr<ModelTypeSyncWorkerImpl> worker_;
88 scoped_refptr<base::SequencedTaskRunner> sync_thread_; 88 scoped_refptr<base::SequencedTaskRunner> sync_thread_;
89 }; 89 };
90 90
91 ModelTypeSyncWorkerWrapper::ModelTypeSyncWorkerWrapper( 91 ModelTypeSyncWorkerWrapper::ModelTypeSyncWorkerWrapper(
92 const base::WeakPtr<ModelTypeSyncWorkerImpl>& worker, 92 const base::WeakPtr<ModelTypeSyncWorkerImpl>& worker,
93 const scoped_refptr<base::SequencedTaskRunner>& sync_thread) 93 const scoped_refptr<base::SequencedTaskRunner>& sync_thread)
94 : worker_(worker), sync_thread_(sync_thread) { 94 : worker_(worker), sync_thread_(sync_thread) {
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 for (ScopedVector<ModelTypeSyncWorkerImpl>::const_iterator it = 356 for (ScopedVector<ModelTypeSyncWorkerImpl>::const_iterator it =
357 model_type_sync_workers_.begin(); 357 model_type_sync_workers_.begin();
358 it != model_type_sync_workers_.end(); 358 it != model_type_sync_workers_.end();
359 ++it) { 359 ++it) {
360 enabled_off_thread_types.Put((*it)->GetModelType()); 360 enabled_off_thread_types.Put((*it)->GetModelType());
361 } 361 }
362 return enabled_off_thread_types; 362 return enabled_off_thread_types;
363 } 363 }
364 364
365 } // namespace syncer 365 } // namespace syncer
OLDNEW
« no previous file with comments | « sync/sessions/model_type_registry.h ('k') | sync/sessions/model_type_registry_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698