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

Side by Side Diff: chrome/browser/sync/sessions/sessions_sync_manager.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_SYNC_SESSIONS_SESSIONS_SYNC_MANAGER_H_ 5 #ifndef CHROME_BROWSER_SYNC_SESSIONS_SESSIONS_SYNC_MANAGER_H_
6 #define CHROME_BROWSER_SYNC_SESSIONS_SESSIONS_SYNC_MANAGER_H_ 6 #define CHROME_BROWSER_SYNC_SESSIONS_SESSIONS_SYNC_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 SessionsSyncManager(Profile* profile, 89 SessionsSyncManager(Profile* profile,
90 sync_driver::LocalDeviceInfoProvider* local_device, 90 sync_driver::LocalDeviceInfoProvider* local_device,
91 scoped_ptr<LocalSessionEventRouter> router); 91 scoped_ptr<LocalSessionEventRouter> router);
92 virtual ~SessionsSyncManager(); 92 virtual ~SessionsSyncManager();
93 93
94 // syncer::SyncableService implementation. 94 // syncer::SyncableService implementation.
95 virtual syncer::SyncMergeResult MergeDataAndStartSyncing( 95 virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
96 syncer::ModelType type, 96 syncer::ModelType type,
97 const syncer::SyncDataList& initial_sync_data, 97 const syncer::SyncDataList& initial_sync_data,
98 scoped_ptr<syncer::SyncChangeProcessor> sync_processor, 98 scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
99 scoped_ptr<syncer::SyncErrorFactory> error_handler) OVERRIDE; 99 scoped_ptr<syncer::SyncErrorFactory> error_handler) override;
100 virtual void StopSyncing(syncer::ModelType type) OVERRIDE; 100 virtual void StopSyncing(syncer::ModelType type) override;
101 virtual syncer::SyncDataList GetAllSyncData( 101 virtual syncer::SyncDataList GetAllSyncData(
102 syncer::ModelType type) const OVERRIDE; 102 syncer::ModelType type) const override;
103 virtual syncer::SyncError ProcessSyncChanges( 103 virtual syncer::SyncError ProcessSyncChanges(
104 const tracked_objects::Location& from_here, 104 const tracked_objects::Location& from_here,
105 const syncer::SyncChangeList& change_list) OVERRIDE; 105 const syncer::SyncChangeList& change_list) override;
106 106
107 // OpenTabsUIDelegate implementation. 107 // OpenTabsUIDelegate implementation.
108 virtual bool GetSyncedFaviconForPageURL( 108 virtual bool GetSyncedFaviconForPageURL(
109 const std::string& pageurl, 109 const std::string& pageurl,
110 scoped_refptr<base::RefCountedMemory>* favicon_png) const OVERRIDE; 110 scoped_refptr<base::RefCountedMemory>* favicon_png) const override;
111 virtual bool GetAllForeignSessions( 111 virtual bool GetAllForeignSessions(
112 std::vector<const SyncedSession*>* sessions) OVERRIDE; 112 std::vector<const SyncedSession*>* sessions) override;
113 virtual bool GetForeignSession( 113 virtual bool GetForeignSession(
114 const std::string& tag, 114 const std::string& tag,
115 std::vector<const SessionWindow*>* windows) OVERRIDE; 115 std::vector<const SessionWindow*>* windows) override;
116 virtual bool GetForeignTab(const std::string& tag, 116 virtual bool GetForeignTab(const std::string& tag,
117 const SessionID::id_type tab_id, 117 const SessionID::id_type tab_id,
118 const SessionTab** tab) OVERRIDE; 118 const SessionTab** tab) override;
119 virtual void DeleteForeignSession(const std::string& tag) OVERRIDE; 119 virtual void DeleteForeignSession(const std::string& tag) override;
120 virtual bool GetLocalSession(const SyncedSession* * local_session) OVERRIDE; 120 virtual bool GetLocalSession(const SyncedSession* * local_session) override;
121 121
122 // LocalSessionEventHandler implementation. 122 // LocalSessionEventHandler implementation.
123 virtual void OnLocalTabModified(SyncedTabDelegate* modified_tab) OVERRIDE; 123 virtual void OnLocalTabModified(SyncedTabDelegate* modified_tab) override;
124 virtual void OnFaviconPageUrlsUpdated( 124 virtual void OnFaviconPageUrlsUpdated(
125 const std::set<GURL>& updated_favicon_page_urls) OVERRIDE; 125 const std::set<GURL>& updated_favicon_page_urls) override;
126 126
127 // Returns the tag used to uniquely identify this machine's session in the 127 // Returns the tag used to uniquely identify this machine's session in the
128 // sync model. 128 // sync model.
129 const std::string& current_machine_tag() const { 129 const std::string& current_machine_tag() const {
130 DCHECK(!current_machine_tag_.empty()); 130 DCHECK(!current_machine_tag_.empty());
131 return current_machine_tag_; 131 return current_machine_tag_;
132 } 132 }
133 133
134 // Return the virtual URL of the current tab, even if it's pending. 134 // Return the virtual URL of the current tab, even if it's pending.
135 static GURL GetCurrentVirtualURL(const SyncedTabDelegate& tab_delegate); 135 static GURL GetCurrentVirtualURL(const SyncedTabDelegate& tab_delegate);
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 374
375 scoped_ptr<LocalSessionEventRouter> local_event_router_; 375 scoped_ptr<LocalSessionEventRouter> local_event_router_;
376 scoped_ptr<SyncedWindowDelegatesGetter> synced_window_getter_; 376 scoped_ptr<SyncedWindowDelegatesGetter> synced_window_getter_;
377 377
378 DISALLOW_COPY_AND_ASSIGN(SessionsSyncManager); 378 DISALLOW_COPY_AND_ASSIGN(SessionsSyncManager);
379 }; 379 };
380 380
381 } // namespace browser_sync 381 } // namespace browser_sync
382 382
383 #endif // CHROME_BROWSER_SYNC_SESSIONS_SESSIONS_SYNC_MANAGER_H_ 383 #endif // CHROME_BROWSER_SYNC_SESSIONS_SESSIONS_SYNC_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698