Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/startup/startup_browser_creator.cc

 // Copyright (c) 2012 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/ui/startup/startup_browser_creator.h"
 
 #include <algorithm>   // For max().
 #include <set>
 
 #include "apps/app_load_service.h"
@@ skipping 135 matching lines @@
     }
   }
 
   bool HasBeenLaunched(const Profile* profile) const {
     return launched_profiles_.find(profile) != launched_profiles_.end();
   }
 
   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);
     }
   }
 
   void Clear() {
     launched_profiles_.clear();
     opened_profiles_.clear();
   }
@@ skipping 27 matching lines @@
     registrar_.Remove(this, chrome::NOTIFICATION_BROWSER_WINDOW_READY,
                       content::NotificationService::AllSources());
     registrar_.Remove(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
                       content::NotificationService::AllSources());
   }
 
   void ActivateProfile() {
     // 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.
       if (browser)
         browser->window()->Activate();
       // No need try to activate this profile again.
       profile_to_activate_ = NULL;
     }
     // Assign true here, even if no browser was actually activated, so that
     // the test can stop waiting, and fail gracefully when needed.
@@ skipping 96 matching lines @@
   // Note: This check should have been done in ProcessCmdLineImpl()
   // before calling this function. However chromeos/login/login_utils.cc
   // calls this function directly (see comments there) so it has to be checked
   // again.
   const bool silent_launch = command_line.HasSwitch(switches::kSilentLaunch);
 
   if (!silent_launch) {
     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
     // or desktop.
     // 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,
                                in_synchronous_profile_launch_,
                                host_desktop_type);
     in_synchronous_profile_launch_ = false;
     if (!launched) {
       LOG(ERROR) << "launch error";
       return false;
     }
@@ skipping 492 matching lines @@
 base::FilePath GetStartupProfilePath(const base::FilePath& user_data_dir,
                                      const base::CommandLine& command_line) {
   if (command_line.HasSwitch(switches::kProfileDirectory)) {
     return user_data_dir.Append(
         command_line.GetSwitchValuePath(switches::kProfileDirectory));
   }
 
   // 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(
       user_data_dir);
 }