chrome/browser/ui/sync/one_click_signin_sync_starter.cc - Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType

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/ui/sync/one_click_signin_sync_starter.cc

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl

Patch Set: Fix build on Mac and CrOS Created 5 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/sync/one_click_signin_sync_starter.h ('k') | chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc » ('j') | ui/gfx/host_desktop_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/sync/one_click_signin_sync_starter.cc

diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc

index a87c44c294417004894363ef1912794d14871c0f..a95449c48e0ed3f3749516a3298b15308f1944ed 100644

--- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc

+++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc

@@ -85,7 +85,7 @@ OneClickSigninSyncStarter::OneClickSigninSyncStarter(

: content::WebContentsObserver(web_contents),

profile_(NULL),

start_mode_(start_mode),

- desktop_type_(chrome::HOST_DESKTOP_TYPE_NATIVE),

+ desktop_type_(ui::HOST_DESKTOP_TYPE_NATIVE),

confirmation_required_(confirmation_required),

continue_url_(continue_url),

sync_setup_completed_callback_(sync_setup_completed_callback),

@@ -277,7 +277,7 @@ void OneClickSigninSyncStarter::CreateNewSignedInProfile() {

}

void OneClickSigninSyncStarter::CompleteInitForNewProfile(

- chrome::HostDesktopType desktop_type,

+ ui::HostDesktopType desktop_type,

Profile* new_profile,

Profile::CreateStatus status) {

DCHECK_NE(profile_, new_profile);

@@ -493,7 +493,7 @@ void OneClickSigninSyncStarter::DisplayFinalConfirmationBubble(

Browser* OneClickSigninSyncStarter::EnsureBrowser(

Browser* browser,

Profile* profile,

- chrome::HostDesktopType desktop_type) {

+ ui::HostDesktopType desktop_type) {

if (!browser) {

// The user just created a new profile or has closed the browser that

// we used previously. Grab the most recently active browser or else