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

Unified Diff: chrome/browser/ui/sync/one_click_signin_sync_starter.h

Issue 1686833003: Remove HostDesktopType from profiles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-16
Patch Set: desktop linux and mac Created 4 years, 10 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
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 349a5393222a8ac32366371cc096eda4afbab2a7..515132ef0d2130c90e3f5fd85c298cae1b57582b 100644
--- a/chrome/browser/ui/sync/one_click_signin_sync_starter.h
+++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.h
@@ -14,7 +14,6 @@
#include "base/memory/weak_ptr.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser_list_observer.h"
-#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/sync/profile_signin_confirmation_helper.h"
#include "chrome/browser/ui/webui/signin/login_ui_service.h"
#include "components/signin/core/browser/signin_tracker.h"
@@ -112,9 +111,7 @@ class OneClickSigninSyncStarter : public SigninTracker::Observer,
// If the |browser| argument is non-null, returns the pointer directly.
// Otherwise creates a new browser for the given profile on the given
// desktop, adds an empty tab and makes sure the browser is visible.
- static Browser* EnsureBrowser(Browser* browser,
- Profile* profile,
- chrome::HostDesktopType desktop_type);
+ static Browser* EnsureBrowser(Browser* browser, Profile* profile);
private:
friend class OneClickSigninSyncStarterTest;
@@ -173,8 +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,
- Profile* profile,
+ void CompleteInitForNewProfile(Profile* profile,
Profile::CreateStatus status);
#endif // defined(ENABLE_CONFIGURATION_POLICY)
@@ -228,7 +224,6 @@ class OneClickSigninSyncStarter : public SigninTracker::Observer,
Browser* browser_;
scoped_ptr<SigninTracker> signin_tracker_;
StartSyncMode start_mode_;
- chrome::HostDesktopType desktop_type_;
ConfirmationRequired confirmation_required_;
GURL current_url_;
GURL continue_url_;
« no previous file with comments | « chrome/browser/ui/cocoa/profiles/profile_menu_controller.mm ('k') | chrome/browser/ui/sync/one_click_signin_sync_starter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698