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

Side by Side Diff: chrome/browser/sync/sessions/notification_service_sessions_router.cc

Issue 2343463003: [Sync] Fix namespaces for the sync_sessions component. (Closed)
Patch Set: Fix Android. Created 4 years, 3 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 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h" 5 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/history/history_service_factory.h" 9 #include "chrome/browser/history/history_service_factory.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 20 matching lines...) Expand all
31 #include "chrome/browser/supervised_user/supervised_user_service.h" 31 #include "chrome/browser/supervised_user/supervised_user_service.h"
32 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" 32 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
33 #endif 33 #endif
34 34
35 #if defined(ENABLE_EXTENSIONS) 35 #if defined(ENABLE_EXTENSIONS)
36 #include "chrome/browser/extensions/tab_helper.h" 36 #include "chrome/browser/extensions/tab_helper.h"
37 #endif 37 #endif
38 38
39 using content::NavigationController; 39 using content::NavigationController;
40 using content::WebContents; 40 using content::WebContents;
41 using sync_sessions::SyncedTabDelegate;
42 using sync_sessions::LocalSessionEventHandler;
41 43
42 namespace browser_sync { 44 namespace browser_sync {
skym 2016/09/14 22:29:58 Should be namespace sync_sessions
maxbogue 2016/09/15 00:43:53 Done.
43 45
44 namespace { 46 namespace {
45 47
46 SyncedTabDelegate* GetSyncedTabDelegateFromWebContents( 48 SyncedTabDelegate* GetSyncedTabDelegateFromWebContents(
47 content::WebContents* web_contents) { 49 content::WebContents* web_contents) {
48 #if BUILDFLAG(ANDROID_JAVA_UI) 50 #if BUILDFLAG(ANDROID_JAVA_UI)
49 TabAndroid* tab = TabAndroid::FromWebContents(web_contents); 51 TabAndroid* tab = TabAndroid::FromWebContents(web_contents);
50 return tab ? tab->GetSyncedTabDelegate() : nullptr; 52 return tab ? tab->GetSyncedTabDelegate() : nullptr;
51 #else 53 #else
52 SyncedTabDelegate* delegate = 54 SyncedTabDelegate* delegate =
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 DCHECK(!handler_); 206 DCHECK(!handler_);
205 handler_ = handler; 207 handler_ = handler;
206 } 208 }
207 209
208 void NotificationServiceSessionsRouter::Stop() { 210 void NotificationServiceSessionsRouter::Stop() {
209 weak_ptr_factory_.InvalidateWeakPtrs(); 211 weak_ptr_factory_.InvalidateWeakPtrs();
210 handler_ = NULL; 212 handler_ = NULL;
211 } 213 }
212 214
213 } // namespace browser_sync 215 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698