Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/ash/launcher/chrome_launcher_controller.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/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
@@ skipping 675 matching lines @@
   }
 
 #if defined(OS_WIN)
   if (LaunchedInNativeDesktop(app_id))
     return;
 #endif
 
   // The app will be created for the currently active profile.
   AppLaunchParams params(
       profile_, extension, ui::DispositionFromEventFlags(event_flags),
-      chrome::HOST_DESKTOP_TYPE_ASH, extensions::SOURCE_APP_LAUNCHER);
+      ui::HOST_DESKTOP_TYPE_ASH, extensions::SOURCE_APP_LAUNCHER);
   if (source != ash::LAUNCH_FROM_UNKNOWN &&
       app_id == extensions::kWebStoreAppId) {
     // Get the corresponding source string.
     std::string source_value = GetSourceFromAppListSource(source);
 
     // Set an override URL to include the source.
     GURL extension_url = extensions::AppLaunchInfo::GetFullLaunchURL(extension);
     params.override_url = net::AppendQueryParameter(
         extension_url, extension_urls::kWebstoreSourceField, source_value);
   }
@@ skipping 158 matching lines @@
   LOG(ERROR) << "Unexpected change of shelf item id: " << id;
   id_to_item_controller_map_.erase(iter);
 }
 
 bool ChromeLauncherController::IsLoggedInAsGuest() {
   return profile_->IsGuestSession();
 }
 
 void ChromeLauncherController::CreateNewWindow() {
   // Use the currently active user.
-  chrome::NewEmptyWindow(profile_, chrome::HOST_DESKTOP_TYPE_ASH);
+  chrome::NewEmptyWindow(profile_, ui::HOST_DESKTOP_TYPE_ASH);
 }
 
 void ChromeLauncherController::CreateNewIncognitoWindow() {
   // Use the currently active user.
   chrome::NewEmptyWindow(profile_->GetOffTheRecordProfile(),
-                         chrome::HOST_DESKTOP_TYPE_ASH);
+                         ui::HOST_DESKTOP_TYPE_ASH);
 }
 
 void ChromeLauncherController::PersistPinnedState() {
   if (ignore_persist_pinned_state_change_)
     return;
   // It is a coding error to call PersistPinnedState() if the pinned apps are
   // not user-editable. The code should check earlier and not perform any
   // modification actions that trigger persisting the state.
   if (!CanPin()) {
     NOTREACHED() << "Can't pin but pinned state being updated";
@@ skipping 1122 matching lines @@
   return profile->IsOffTheRecord() && !profile->IsGuestSession() &&
          !profile->IsSystemProfile();
 }
 
 void ChromeLauncherController::CloseWindowedAppsFromRemovedExtension(
     const std::string& app_id,
     const Profile* profile) {
   // This function cannot rely on the controller's enumeration functionality
   // since the extension has already be unloaded.
   const BrowserList* ash_browser_list =
-      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
+      BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH);
   std::vector<Browser*> browser_to_close;
   for (BrowserList::const_reverse_iterator
            it = ash_browser_list->begin_last_active();
        it != ash_browser_list->end_last_active(); ++it) {
     Browser* browser = *it;
     if (!browser->is_type_tabbed() && browser->is_type_popup() &&
         browser->is_app() &&
         app_id ==
             web_app::GetExtensionIdFromApplicationName(browser->app_name()) &&
         profile == browser->profile()) {
@@ skipping 64 matching lines @@
 void ChromeLauncherController::ReleaseProfile() {
   if (app_sync_ui_state_)
     app_sync_ui_state_->RemoveObserver(this);
 
   extensions::ExtensionRegistry::Get(profile_)->RemoveObserver(this);
 
   PrefServiceSyncable::FromProfile(profile_)->RemoveObserver(this);
 
   pref_change_registrar_.RemoveAll();
 }