Move chrome::HostDesktopType to ui::HostDesktopType

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

Index: chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
index 83668d1f98196362f0588ef0fe4e24c28b871c4c..1ec4678b0597118e5e7cd6850837a5dc2d66b098 100644
--- a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.cc
@@ -103,7 +103,7 @@ void BrowserShortcutLauncherItemController::UpdateBrowserItemState() {
 
   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() &&
@@ -124,9 +124,8 @@ void BrowserShortcutLauncherItemController::SetShelfIDForBrowserWindowContents(
     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;
 
@@ -137,7 +136,7 @@ void BrowserShortcutLauncherItemController::SetShelfIDForBrowserWindowContents(
 
 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))
@@ -148,9 +147,7 @@ bool BrowserShortcutLauncherItemController::IsOpen() const {
 
 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;
@@ -167,9 +164,7 @@ void BrowserShortcutLauncherItemController::Launch(ash::LaunchSource source,
 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();
@@ -190,7 +185,7 @@ BrowserShortcutLauncherItemController::GetApplicationList(int event_flags) {
   // 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;
@@ -310,7 +305,7 @@ BrowserShortcutLauncherItemController::ActivateOrAdvanceToNextBrowser() {
   // 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) {
@@ -342,8 +337,7 @@ BrowserShortcutLauncherItemController::ActivateOrAdvanceToNextBrowser() {
       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];
@@ -358,9 +352,8 @@ BrowserShortcutLauncherItemController::ActivateOrAdvanceToNextBrowser() {
 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.