Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/startup/startup_browser_creator.cc

Index: chrome/browser/ui/startup/startup_browser_creator.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc
index f7fac34905f789c96ce28d0107dca525986da7ce..5dade7affbad2178e51624c50f22155bb58980f9 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator.cc
@@ -153,9 +153,9 @@ class ProfileLaunchObserver : public content::NotificationObserver {
   void AddLaunched(Profile* profile) {
     launched_profiles_.insert(profile);
     // Since the startup code only executes for browsers launched in
-    // desktop mode, i.e., HOST_DESKTOP_TYPE_NATIVE. Ash should never get here.
-    if (chrome::FindBrowserWithProfile(profile,
-                                       chrome::HOST_DESKTOP_TYPE_NATIVE)) {
+    // desktop mode, i.e., ui::HOST_DESKTOP_TYPE_NATIVE. Ash should never get
+    // here.
+    if (chrome::FindBrowserWithProfile(profile, ui::HOST_DESKTOP_TYPE_NATIVE)) {
       // A browser may get opened before we get initialized (e.g., in tests),
       // so we never see the NOTIFICATION_BROWSER_WINDOW_READY for it.
       opened_profiles_.insert(profile);
@@ -203,7 +203,7 @@ class ProfileLaunchObserver : public content::NotificationObserver {
     // We need to test again, in case the profile got deleted in the mean time.
     if (profile_to_activate_) {
       Browser* browser = chrome::FindBrowserWithProfile(
-          profile_to_activate_, chrome::HOST_DESKTOP_TYPE_NATIVE);
+          profile_to_activate_, ui::HOST_DESKTOP_TYPE_NATIVE);
       // |profile| may never get launched, e.g., if it only had
       // incognito Windows and one of them was used to exit Chrome.
       // So it won't have a browser in that case.
@@ -320,8 +320,7 @@ bool StartupBrowserCreator::LaunchBrowser(
     StartupBrowserCreatorImpl lwp(cur_dir, command_line, this, is_first_run);
     const std::vector<GURL> urls_to_launch =
         GetURLsFromCommandLine(command_line, cur_dir, profile);
-    chrome::HostDesktopType host_desktop_type =
-        chrome::HOST_DESKTOP_TYPE_NATIVE;
+    ui::HostDesktopType host_desktop_type = ui::HOST_DESKTOP_TYPE_NATIVE;
 
 #if defined(USE_ASH) && !defined(OS_CHROMEOS)
     // We want to maintain only one type of instance for now, either ASH
@@ -329,7 +328,7 @@ bool StartupBrowserCreator::LaunchBrowser(
     // TODO(shrikant): Remove this code once we decide on running both desktop
     // and ASH instances side by side.
     if (ash::Shell::HasInstance())
-      host_desktop_type = chrome::HOST_DESKTOP_TYPE_ASH;
+      host_desktop_type = ui::HOST_DESKTOP_TYPE_ASH;
 #endif
 
     const bool launched = lwp.Launch(profile, urls_to_launch,
@@ -842,8 +841,8 @@ base::FilePath GetStartupProfilePath(const base::FilePath& user_data_dir,
   // If we are showing the app list then chrome isn't shown so load the app
   // list's profile rather than chrome's.
   if (command_line.HasSwitch(switches::kShowAppList)) {
-    return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)->
-        GetProfilePath(user_data_dir);
+    return AppListService::Get(ui::HOST_DESKTOP_TYPE_NATIVE)
+        ->GetProfilePath(user_data_dir);
   }
 
   return g_browser_process->profile_manager()->GetLastUsedProfileDir(