Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/profiles/profile_window.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile_window.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 87 matching lines @@
     }
   }
 
   // Profile for which the browser should be opened.
   Profile* profile_;
   ProfileManager::CreateCallback callback_;
 
   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)
     return;
 
   chrome::startup::IsProcessStartup is_process_startup =
       chrome::startup::IS_NOT_PROCESS_STARTUP;
   chrome::startup::IsFirstRun is_first_run = chrome::startup::IS_NOT_FIRST_RUN;
 
   // If this is a brand new profile, then start a first run window.
@@ skipping 128 matching lines @@
     if (entry->GetUserName() == profile_email)
       return entry->GetPath();
   }
   return base::FilePath();
 }
 
 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();
 #else
   DCHECK(profile);
 
   if (!always_create) {
     Browser* browser = chrome::FindTabbedBrowser(profile, false, desktop_type);
     if (browser) {
       browser->window()->Activate();
       return;
     }
   }
 
   content::RecordAction(UserMetricsAction("NewWindow"));
   base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
   StartupBrowserCreator browser_creator;
   browser_creator.LaunchBrowser(
       command_line, profile, base::FilePath(), process_startup, is_first_run);
 #endif  // defined(OS_IOS)
 }
 
 void SwitchToProfile(const base::FilePath& path,
-                     chrome::HostDesktopType desktop_type,
+                     ui::HostDesktopType desktop_type,
                      bool always_create,
                      ProfileManager::CreateCallback callback,
                      ProfileMetrics::ProfileOpen metric) {
   ProfileMetrics::LogProfileSwitch(metric,
                                    g_browser_process->profile_manager(),
                                    path);
   g_browser_process->profile_manager()->CreateProfileAsync(
       path,
       base::Bind(&OpenBrowserWindowForProfile,
                  callback,
                  always_create,
                  false,
                  desktop_type),
       base::string16(),
       base::string16(),
       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,
                                    g_browser_process->profile_manager(),
                                    path);
   g_browser_process->profile_manager()->CreateProfileAsync(
       path,
       base::Bind(&OpenBrowserWindowForProfile,
                  callback,
                  false,
                  false,
                  desktop_type),
       base::string16(),
       base::string16(),
       std::string());
 }
 
 bool HasProfileSwitchTargets(Profile* profile) {
   size_t min_profiles = profile->IsGuestSession() ? 1 : 2;
   size_t number_of_profiles =
       g_browser_process->profile_manager()->GetNumberOfProfiles();
   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 =
       g_browser_process->profile_manager()->GetProfileInfoCache();
 
   int placeholder_avatar_index = profiles::GetPlaceholderAvatarIndex();
   ProfileManager::CreateMultiProfileAsync(
       cache.ChooseNameForNewProfile(placeholder_avatar_index),
       base::UTF8ToUTF16(profiles::GetDefaultAvatarIconUrl(
           placeholder_avatar_index)),
@@ skipping 212 matching lines @@
   PrefService* local_state = g_browser_process->local_state();
   const bool dismissed = local_state->GetBoolean(
       prefs::kProfileAvatarRightClickTutorialDismissed);
 
   // Don't show the tutorial if it's already been dismissed or if right-clicking
   // wouldn't show any targets.
   return !dismissed && HasProfileSwitchTargets(profile);
 }
 
 }  // namespace profiles