Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc

 // Copyright (c) 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/browser_shortcut_launcher_item_controller.h"
 
 #include <vector>
 
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_model.h"
@@ skipping 85 matching lines @@
           browser->tab_strip_model()->GetActiveWebContents();
       if (contents &&
           (launcher_controller()->GetShelfIDForWebContents(contents) !=
               browser_item.id))
         browser_status = ash::STATUS_RUNNING;
     }
   }
 
   if (browser_status == ash::STATUS_CLOSED) {
     const BrowserList* ash_browser_list =
-        BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
+        BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH);
     for (BrowserList::const_reverse_iterator it =
              ash_browser_list->begin_last_active();
          it != ash_browser_list->end_last_active() &&
          browser_status == ash::STATUS_CLOSED; ++it) {
       if (IsBrowserRepresentedInBrowserList(*it))
         browser_status = ash::STATUS_RUNNING;
     }
   }
 
   if (browser_status != browser_item.status) {
     browser_item.status = browser_status;
     model->Set(browser_index, browser_item);
   }
 }
 
 void BrowserShortcutLauncherItemController::SetShelfIDForBrowserWindowContents(
     Browser* browser,
     content::WebContents* web_contents) {
   // We need to call SetShelfIDForWindow for V1 applications since they are
   // content which might change and as such change the application type.
-  if (!browser ||
-      !launcher_controller()->IsBrowserFromActiveUser(browser) ||
-      browser->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH ||
+  if (!browser || !launcher_controller()->IsBrowserFromActiveUser(browser) ||
+      browser->host_desktop_type() != ui::HOST_DESKTOP_TYPE_ASH ||
       IsSettingsBrowser(browser))
     return;
 
   ash::SetShelfIDForWindow(
       launcher_controller()->GetShelfIDForWebContents(web_contents),
       browser->window()->GetNativeWindow());
 }
 
 bool BrowserShortcutLauncherItemController::IsOpen() const {
   const BrowserList* ash_browser_list =
-      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
+      BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH);
   for (BrowserList::const_iterator it = ash_browser_list->begin();
        it != ash_browser_list->end(); ++it) {
     if (launcher_controller()->IsBrowserFromActiveUser(*it))
       return true;
   }
   return false;
 }
 
 bool BrowserShortcutLauncherItemController::IsVisible() const {
   Browser* last_browser = chrome::FindTabbedBrowser(
-      launcher_controller()->profile(),
-      true,
-      chrome::HOST_DESKTOP_TYPE_ASH);
+      launcher_controller()->profile(), true, ui::HOST_DESKTOP_TYPE_ASH);
 
   if (!last_browser) {
     return false;
   }
 
   aura::Window* window = last_browser->window()->GetNativeWindow();
   return ash::wm::IsActiveWindow(window);
 }
 
 void BrowserShortcutLauncherItemController::Launch(ash::LaunchSource source,
                                                    int event_flags) {
 }
 
 ash::ShelfItemDelegate::PerformedAction
 BrowserShortcutLauncherItemController::Activate(ash::LaunchSource source) {
   Browser* last_browser = chrome::FindTabbedBrowser(
-      launcher_controller()->profile(),
-      true,
-      chrome::HOST_DESKTOP_TYPE_ASH);
+      launcher_controller()->profile(), true, ui::HOST_DESKTOP_TYPE_ASH);
 
   if (!last_browser) {
     launcher_controller()->CreateNewWindow();
     return kNewWindowCreated;
   }
 
   return launcher_controller()->ActivateWindowOrMinimizeIfActive(
       last_browser->window(), GetApplicationList(0).size() == 2);
 }
 
 void BrowserShortcutLauncherItemController::Close() {
 }
 
 ChromeLauncherAppMenuItems
 BrowserShortcutLauncherItemController::GetApplicationList(int event_flags) {
   ChromeLauncherAppMenuItems items;
   bool found_tabbed_browser = false;
   // Add the application name to the menu.
   items.push_back(new ChromeLauncherAppMenuItem(GetTitle(), NULL, false));
   const BrowserList* ash_browser_list =
-      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
+      BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH);
   for (BrowserList::const_iterator it = ash_browser_list->begin();
        it != ash_browser_list->end(); ++it) {
     Browser* browser = *it;
     // Make sure that the browser is from the current user, has a proper window,
     // and the window was already shown.
     if (!launcher_controller()->IsBrowserFromActiveUser(browser))
       continue;
     if (!(browser->window() && browser->window()->GetNativeWindow()))
       continue;
     if (!(browser->window()->GetNativeWindow()->IsVisible() ||
@@ skipping 99 matching lines @@
   return profile->IsOffTheRecord() && !profile->IsGuestSession();
 }
 
 ash::ShelfItemDelegate::PerformedAction
 BrowserShortcutLauncherItemController::ActivateOrAdvanceToNextBrowser() {
   // Create a list of all suitable running browsers.
   std::vector<Browser*> items;
   // We use the list in the order of how the browsers got created - not the LRU
   // order.
   const BrowserList* ash_browser_list =
-      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
+      BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH);
   for (BrowserList::const_iterator it =
            ash_browser_list->begin();
        it != ash_browser_list->end(); ++it) {
     if (IsBrowserRepresentedInBrowserList(*it))
       items.push_back(*it);
   }
   // If there are no suitable browsers we create a new one.
   if (items.empty()) {
     launcher_controller()->CreateNewWindow();
     return kNewWindowCreated;
@@ skipping 11 matching lines @@
   } else {
     // If there is more then one suitable browser, we advance to the next if
     // |browser| is already active - or - check the last used browser if it can
     // be used.
     std::vector<Browser*>::iterator i =
         std::find(items.begin(), items.end(), browser);
     if (i != items.end()) {
       browser = (++i == items.end()) ? items[0] : *i;
     } else {
       browser = chrome::FindTabbedBrowser(launcher_controller()->profile(),
-                                          true,
-                                          chrome::HOST_DESKTOP_TYPE_ASH);
+                                          true, ui::HOST_DESKTOP_TYPE_ASH);
       if (!browser ||
           !IsBrowserRepresentedInBrowserList(browser))
         browser = items[0];
     }
   }
   DCHECK(browser);
   browser->window()->Show();
   browser->window()->Activate();
   return kExistingWindowActivated;
 }
 
 bool BrowserShortcutLauncherItemController::IsBrowserRepresentedInBrowserList(
     Browser* browser) {
   // Only Ash desktop browser windows for the active user are represented.
-  if (!browser ||
-      !launcher_controller()->IsBrowserFromActiveUser(browser) ||
-      browser->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH)
+  if (!browser || !launcher_controller()->IsBrowserFromActiveUser(browser) ||
+      browser->host_desktop_type() != ui::HOST_DESKTOP_TYPE_ASH)
     return false;
 
   // v1 App popup windows with a valid app id have their own icon.
   if (browser->is_app() &&
       browser->is_type_popup() &&
       launcher_controller()->GetShelfIDForAppID(
           web_app::GetExtensionIdFromApplicationName(browser->app_name())) > 0)
     return false;
 
   // Settings browsers have their own icon.
   if (IsSettingsBrowser(browser))
     return false;
 
   // Tabbed browser and other popup windows are all represented.
   return true;
 }