chrome/browser/ui/sync/one_click_signin_sync_starter.h - 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.h

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/startup/startup_browser_creator_interactive_uitest.cc ('k') | chrome/browser/ui/sync/one_click_signin_sync_starter.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.h

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

index 0e4c815059e0e5046a3b93e7321e590c8975328b..f639806c5bb3f203598ae089fd8eaf790a782ba5 100644

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

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

@@ -112,7 +112,7 @@ class OneClickSigninSyncStarter : public SigninTracker::Observer,

// desktop, adds an empty tab and makes sure the browser is visible.

static Browser* EnsureBrowser(Browser* browser,

Profile* profile,

- chrome::HostDesktopType desktop_type);

+ ui::HostDesktopType desktop_type);

private:

friend class OneClickSigninSyncStarterTest;

@@ -170,7 +170,7 @@ class OneClickSigninSyncStarter : public SigninTracker::Observer,

// Callback invoked once a profile is created, so we can complete the

// credentials transfer, load policy, and open the first window.

- void CompleteInitForNewProfile(chrome::HostDesktopType desktop_type,

+ void CompleteInitForNewProfile(ui::HostDesktopType desktop_type,

Profile* profile,

Profile::CreateStatus status);

@@ -223,7 +223,7 @@ class OneClickSigninSyncStarter : public SigninTracker::Observer,

Browser* browser_;

scoped_ptr<SigninTracker> signin_tracker_;

StartSyncMode start_mode_;

- chrome::HostDesktopType desktop_type_;

+ ui::HostDesktopType desktop_type_;

ConfirmationRequired confirmation_required_;

GURL continue_url_;