chrome/browser/supervised_user/supervised_user_registration_utility.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/supervised_user/supervised_user_registration_utility.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/signed_in_devices_manager.cc ('k') | chrome/browser/sync/glue/device_info.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/supervised_user/supervised_user_registration_utility.cc

diff --git a/chrome/browser/supervised_user/supervised_user_registration_utility.cc b/chrome/browser/supervised_user/supervised_user_registration_utility.cc

index c1eb8b09f754271cf39868f0c0ed918f71f088b0..0f582436a1ff87f338aceb658226cf83cf5badc0 100644

--- a/chrome/browser/supervised_user/supervised_user_registration_utility.cc

+++ b/chrome/browser/supervised_user/supervised_user_registration_utility.cc

@@ -22,14 +22,15 @@

#include "chrome/browser/supervised_user/supervised_user_shared_settings_update.h"

#include "chrome/browser/supervised_user/supervised_user_sync_service.h"

#include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h"

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

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

#include "components/signin/core/browser/profile_oauth2_token_service.h"

#include "components/signin/core/browser/signin_client.h"

#include "components/signin/core/browser/signin_manager.h"

+#include "content/public/browser/browser_thread.h"

#include "google_apis/gaia/gaia_urls.h"

#include "google_apis/gaia/google_service_auth_error.h"

+#include "sync/util/get_session_name.h"

using base::DictionaryValue;

@@ -304,7 +305,8 @@ void SupervisedUserRegistrationUtilityImpl::Register(

weak_ptr_factory_.GetWeakPtr())));

}

- browser_sync::DeviceInfo::GetClientName(

+ syncer::GetSessionName(

+ content::BrowserThread::GetBlockingPool(),

base::Bind(&SupervisedUserRegistrationUtilityImpl::FetchToken,

weak_ptr_factory_.GetWeakPtr()));

}