Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/ash/launcher/browser_status_monitor.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/browser_status_monitor.h"
 
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
@@ skipping 123 matching lines @@
   // ChromeLauncherController will fail in win7_aura.
   if (ash::Shell::HasInstance())
     ash::Shell::GetInstance()->GetScreen()->RemoveObserver(this);
 
   chrome::SettingsWindowManager::GetInstance()->RemoveObserver(
       settings_window_observer_.get());
 
   BrowserList::RemoveObserver(this);
 
   BrowserList* browser_list =
-      BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_ASH);
+      BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_ASH);
   for (BrowserList::const_iterator i = browser_list->begin();
        i != browser_list->end(); ++i) {
     OnBrowserRemoved(*i);
   }
 
   STLDeleteContainerPairSecondPointers(webcontents_to_observer_map_.begin(),
                                        webcontents_to_observer_map_.end());
 }
 
 void BrowserStatusMonitor::UpdateAppItemState(
@@ skipping 50 matching lines @@
 }
 
 void BrowserStatusMonitor::OnWindowDestroyed(aura::Window* window) {
   // Remove RootWindow and its ActivationClient from observed list.
   observed_root_windows_.Remove(window);
   observed_activation_clients_.Remove(
       aura::client::GetActivationClient(window));
 }
 
 void BrowserStatusMonitor::OnBrowserAdded(Browser* browser) {
-  if (browser->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH)
+  if (browser->host_desktop_type() != ui::HOST_DESKTOP_TYPE_ASH)
     return;
 
   if (browser->is_type_popup() && browser->is_app()) {
     // Note: A V1 application will set the tab strip observer when the app gets
     // added to the shelf. This makes sure that in the multi user case we will
     // only set the observer while the app item exists in the shelf.
     AddV1AppToShelf(browser);
   } else {
     browser->tab_strip_model()->AddObserver(this);
   }
 }
 
 void BrowserStatusMonitor::OnBrowserRemoved(Browser* browser) {
-  if (browser->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH)
+  if (browser->host_desktop_type() != ui::HOST_DESKTOP_TYPE_ASH)
     return;
 
   if (browser->is_type_popup() && browser->is_app())
     RemoveV1AppFromShelf(browser);
   else
     browser->tab_strip_model()->RemoveObserver(this);
 
   UpdateBrowserItemState();
 }
 
@@ skipping 25 matching lines @@
 
 void BrowserStatusMonitor::ActiveTabChanged(content::WebContents* old_contents,
                                             content::WebContents* new_contents,
                                             int index,
                                             int reason) {
   Browser* browser = NULL;
   // Use |new_contents|. |old_contents| could be NULL.
   DCHECK(new_contents);
   browser = chrome::FindBrowserWithWebContents(new_contents);
 
-  if (browser && browser->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH)
+  if (browser && browser->host_desktop_type() != ui::HOST_DESKTOP_TYPE_ASH)
     return;
 
   ChromeLauncherController::AppState state =
       ChromeLauncherController::APP_STATE_INACTIVE;
 
   // Update immediately on a tab change.
   if (old_contents &&
       (TabStripModel::kNoTab !=
            browser->tab_strip_model()->GetIndexOfWebContents(old_contents)))
     UpdateAppItemState(old_contents, state);
 
   if (new_contents) {
     state = browser->window()->IsActive() ?
         ChromeLauncherController::APP_STATE_WINDOW_ACTIVE :
         ChromeLauncherController::APP_STATE_ACTIVE;
     UpdateAppItemState(new_contents, state);
     UpdateBrowserItemState();
     SetShelfIDForBrowserWindowContents(browser, new_contents);
   }
 }
 
 void BrowserStatusMonitor::TabReplacedAt(TabStripModel* tab_strip_model,
                                          content::WebContents* old_contents,
                                          content::WebContents* new_contents,
                                          int index) {
   DCHECK(old_contents && new_contents);
   Browser* browser = chrome::FindBrowserWithWebContents(new_contents);
 
-  if (browser && browser->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH)
+  if (browser && browser->host_desktop_type() != ui::HOST_DESKTOP_TYPE_ASH)
     return;
 
   UpdateAppItemState(old_contents,
                      ChromeLauncherController::APP_STATE_REMOVED);
   RemoveWebContentsObserver(old_contents);
 
   ChromeLauncherController::AppState state =
       ChromeLauncherController::APP_STATE_ACTIVE;
   if (browser->window()->IsActive() &&
       (tab_strip_model->GetActiveWebContents() == new_contents))
@@ skipping 80 matching lines @@
     content::WebContents* contents) {
   return launcher_controller_->GetShelfIDForWebContents(contents);
 }
 
 void BrowserStatusMonitor::SetShelfIDForBrowserWindowContents(
     Browser* browser,
     content::WebContents* web_contents) {
   launcher_controller_->GetBrowserShortcutLauncherItemController()->
       SetShelfIDForBrowserWindowContents(browser, web_contents);
 }