chrome/browser/sync/sessions/session_data_type_controller.h - Issue 597423002: Device info datatype should be moved to components/sync_driver.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/sessions/session_data_type_controller.h

Issue 597423002: Device info datatype should be moved to components/sync_driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Updated BUILD.gn for sync_driver Created 6 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/supervised_user/DEPS ('K') | « chrome/browser/sync/profile_sync_service_mock.h ('k') | chrome/browser/sync/sessions/session_data_type_controller.cc » ('j') | chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/sessions/session_data_type_controller.h

diff --git a/chrome/browser/sync/sessions/session_data_type_controller.h b/chrome/browser/sync/sessions/session_data_type_controller.h

index 7201d145d99c122d4c6021ac606eb62aa3a6d2a9..0705c64f7cbc427b85e2069b3a6bc76d7fbd42fb 100644

--- a/chrome/browser/sync/sessions/session_data_type_controller.h

+++ b/chrome/browser/sync/sessions/session_data_type_controller.h

@@ -6,7 +6,7 @@

#define CHROME_BROWSER_SYNC_SESSIONS_SESSION_DATA_TYPE_CONTROLLER_H_

#include "base/prefs/pref_change_registrar.h"

-#include "chrome/browser/sync/glue/local_device_info_provider.h"

+#include "components/sync_driver/local_device_info_provider.h"

#include "components/sync_driver/ui_data_type_controller.h"

#include "content/public/browser/notification_observer.h"

#include "content/public/browser/notification_registrar.h"

@@ -26,7 +26,7 @@ class SessionDataTypeController : public sync_driver::UIDataTypeController,

SessionDataTypeController(sync_driver::SyncApiComponentFactory* factory,

Profile* profile,

SyncedWindowDelegatesGetter* synced_window_getter,

- LocalDeviceInfoProvider* local_device);

+ sync_driver::LocalDeviceInfoProvider* local_device);

// NotificationObserver interface.

virtual void Observe(int type,

@@ -52,8 +52,8 @@ class SessionDataTypeController : public sync_driver::UIDataTypeController,

SyncedWindowDelegatesGetter* synced_window_getter_;

content::NotificationRegistrar notification_registrar_;

- LocalDeviceInfoProvider* const local_device_;

- scoped_ptr<LocalDeviceInfoProvider::Subscription> subscription_;

+ sync_driver::LocalDeviceInfoProvider* const local_device_;

+ scoped_ptr<sync_driver::LocalDeviceInfoProvider::Subscription> subscription_;

// Flags that indicate the reason for pending loading models.

bool waiting_on_session_restore_;