chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.cc - 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/extensions/api/signed_in_devices/id_mapping_helper.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/extensions/api/signed_in_devices/id_mapping_helper.h ('k') | chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.cc

diff --git a/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.cc b/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.cc

index 9b41995d3fca5b9cfa313636e63fd095de544416..c2c898f7e86a74e571b2386e02818309e4e8f514 100644

--- a/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.cc

+++ b/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.cc

@@ -11,12 +11,12 @@

#include "base/values.h"

#include "chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.h"

#include "chrome/browser/profiles/profile.h"

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

#include "components/crx_file/id_util.h"

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

using base::DictionaryValue;

using base::Value;

-using browser_sync::DeviceInfo;

+using sync_driver::DeviceInfo;

namespace extensions {

@@ -68,7 +68,7 @@ std::string GetRandomId(

}

void CreateMappingForUnmappedDevices(

- std::vector<browser_sync::DeviceInfo*>* device_info,

+ std::vector<DeviceInfo*>* device_info,

base::DictionaryValue* value) {

for (unsigned int i = 0; i < device_info->size(); ++i) {

DeviceInfo* device = (*device_info)[i];