Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/ash/chrome_new_window_delegate.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/chrome_new_window_delegate.h"
 
 #include "ash/wm/window_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 
 namespace {
 
 void RestoreTabUsingProfile(Profile* profile) {
   TabRestoreService* service = TabRestoreServiceFactory::GetForProfile(profile);
-  service->RestoreMostRecentEntry(NULL, chrome::HOST_DESKTOP_TYPE_ASH);
+  service->RestoreMostRecentEntry(NULL, ui::HOST_DESKTOP_TYPE_ASH);
 }
 
 // Returns the browser for the active window, if any.
 Browser* GetBrowserForActiveWindow() {
   return chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow());
 }
 
 }  // namespace
 
 ChromeNewWindowDelegate::ChromeNewWindowDelegate() {}
@@ skipping 43 matching lines @@
 void ChromeNewWindowDelegate::NewTab() {
   Browser* browser = GetBrowserForActiveWindow();
   if (browser && browser->is_type_tabbed()) {
     chrome::NewTab(browser);
     return;
   }
 
   // Display a browser, setting the focus to the location bar after it is shown.
   {
     chrome::ScopedTabbedBrowserDisplayer displayer(
-        ProfileManager::GetActiveUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
+        ProfileManager::GetActiveUserProfile(), ui::HOST_DESKTOP_TYPE_ASH);
     browser = displayer.browser();
     chrome::NewTab(browser);
   }
 
   browser->SetFocusToLocationBar(false);
 }
 
 void ChromeNewWindowDelegate::NewWindow(bool is_incognito) {
   Profile* profile = ProfileManager::GetActiveUserProfile();
   chrome::NewEmptyWindow(
       is_incognito ? profile->GetOffTheRecordProfile() : profile,
-      chrome::HOST_DESKTOP_TYPE_ASH);
+      ui::HOST_DESKTOP_TYPE_ASH);
 }
 
 void ChromeNewWindowDelegate::RestoreTab() {
   if (tab_restore_helper_.get()) {
     DCHECK(!tab_restore_helper_->tab_restore_service()->IsLoaded());
     return;
   }
 
   Browser* browser = GetBrowserForActiveWindow();
   Profile* profile = browser ? browser->profile() : NULL;
@@ skipping 14 matching lines @@
   }
 }
 
 void ChromeNewWindowDelegate::ShowTaskManager() {
   chrome::OpenTaskManager(NULL);
 }
 
 void ChromeNewWindowDelegate::OpenFeedbackPage() {
   chrome::OpenFeedbackDialog(GetBrowserForActiveWindow());
 }