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

Unified Diff: chrome/browser/ui/webui/history_ui.cc

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: Minor CR feedback addressed. 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
« no previous file with comments | « chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/history_ui.cc
diff --git a/chrome/browser/ui/webui/history_ui.cc b/chrome/browser/ui/webui/history_ui.cc
index d0b867a575d9009734e0ea901ca4520bfd3a8c5f..a1995d4ac8b5f833f57375581781911417c2a7a1 100644
--- a/chrome/browser/ui/webui/history_ui.cc
+++ b/chrome/browser/ui/webui/history_ui.cc
@@ -27,7 +27,6 @@
#include "chrome/browser/history/web_history_service.h"
#include "chrome/browser/history/web_history_service_factory.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sync/glue/device_info.h"
#include "chrome/browser/sync/profile_sync_service.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
#include "chrome/browser/ui/browser_finder.h"
@@ -42,6 +41,7 @@
#include "components/bookmarks/browser/bookmark_utils.h"
#include "components/history/core/browser/history_types.h"
#include "components/search/search.h"
+#include "components/sync_driver/device_info.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_source.h"
#include "content/public/browser/url_data_source.h"
@@ -236,7 +236,7 @@ void GetDeviceNameAndType(const ProfileSyncService* sync_service,
// DeviceInfoTracker becomes available when Sync backend gets initialed.
// It must exist in order for remote history entries to be available.
if (sync_service && sync_service->GetDeviceInfoTracker()) {
- scoped_ptr<browser_sync::DeviceInfo> device_info =
+ scoped_ptr<sync_driver::DeviceInfo> device_info =
sync_service->GetDeviceInfoTracker()->GetDeviceInfo(client_id);
if (device_info.get()) {
*name = device_info->client_name();
« no previous file with comments | « chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698