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

Unified Diff: chrome/browser/profiles/profile_window.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
Index: chrome/browser/profiles/profile_window.cc
diff --git a/chrome/browser/profiles/profile_window.cc b/chrome/browser/profiles/profile_window.cc
index 2f09ebd2a892b3f6fffdfe80f04c11568eabff4a..a3e32fe558b4736e5b6181b029747bbea53915de 100644
--- a/chrome/browser/profiles/profile_window.cc
+++ b/chrome/browser/profiles/profile_window.cc
@@ -105,13 +105,12 @@ class BrowserAddedForProfileObserver : public chrome::BrowserListObserver {
DISALLOW_COPY_AND_ASSIGN(BrowserAddedForProfileObserver);
};
-void OpenBrowserWindowForProfile(
- ProfileManager::CreateCallback callback,
- bool always_create,
- bool is_new_profile,
- chrome::HostDesktopType desktop_type,
- Profile* profile,
- Profile::CreateStatus status) {
+void OpenBrowserWindowForProfile(ProfileManager::CreateCallback callback,
+ bool always_create,
+ bool is_new_profile,
+ ui::HostDesktopType desktop_type,
+ Profile* profile,
+ Profile::CreateStatus status) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
if (status != Profile::CREATE_STATUS_INITIALIZED)
@@ -260,7 +259,7 @@ void FindOrCreateNewWindowForProfile(
Profile* profile,
chrome::startup::IsProcessStartup process_startup,
chrome::startup::IsFirstRun is_first_run,
- chrome::HostDesktopType desktop_type,
+ ui::HostDesktopType desktop_type,
bool always_create) {
#if defined(OS_IOS)
NOTREACHED();
@@ -284,7 +283,7 @@ void FindOrCreateNewWindowForProfile(
}
void SwitchToProfile(const base::FilePath& path,
- chrome::HostDesktopType desktop_type,
+ ui::HostDesktopType desktop_type,
bool always_create,
ProfileManager::CreateCallback callback,
ProfileMetrics::ProfileOpen metric) {
@@ -303,7 +302,7 @@ void SwitchToProfile(const base::FilePath& path,
std::string());
}
-void SwitchToGuestProfile(chrome::HostDesktopType desktop_type,
+void SwitchToGuestProfile(ui::HostDesktopType desktop_type,
ProfileManager::CreateCallback callback) {
const base::FilePath& path = ProfileManager::GetGuestProfilePath();
ProfileMetrics::LogProfileSwitch(ProfileMetrics::SWITCH_PROFILE_GUEST,
@@ -328,7 +327,7 @@ bool HasProfileSwitchTargets(Profile* profile) {
return number_of_profiles >= min_profiles;
}
-void CreateAndSwitchToNewProfile(chrome::HostDesktopType desktop_type,
+void CreateAndSwitchToNewProfile(ui::HostDesktopType desktop_type,
ProfileManager::CreateCallback callback,
ProfileMetrics::ProfileAdd metric) {
ProfileInfoCache& cache =

Powered by Google App Engine
This is Rietveld 408576698