Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

Index: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
index 9e9476b0e075084089994f3ac68e3b83ec6a7bf3..91e58209080a44fc82f02b8dbfddd71455802693 100644
--- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
+++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc
@@ -64,22 +64,22 @@ ui::NativeTheme* GetNativeThemeForWindow(aura::Window* window) {
 
 #if !defined(OS_CHROMEOS) && defined(USE_ASH)
 // Returns the desktop this process was initially launched in.
-chrome::HostDesktopType GetInitialDesktop() {
+ui::HostDesktopType GetInitialDesktop() {
 #if defined(OS_WIN) && defined(USE_ASH)
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kViewerConnect) ||
       command_line->HasSwitch(switches::kViewerLaunchViaAppId)) {
-    return chrome::HOST_DESKTOP_TYPE_ASH;
+    return ui::HOST_DESKTOP_TYPE_ASH;
   }
 #elif defined(OS_LINUX)
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kOpenAsh))
-    return chrome::HOST_DESKTOP_TYPE_ASH;
+    return ui::HOST_DESKTOP_TYPE_ASH;
 #endif
 
-  return chrome::HOST_DESKTOP_TYPE_NATIVE;
+  return ui::HOST_DESKTOP_TYPE_NATIVE;
 }
 #endif  // !defined(OS_CHROMEOS) && defined(USE_ASH)
 
@@ -93,7 +93,7 @@ ChromeBrowserMainExtraPartsAura::~ChromeBrowserMainExtraPartsAura() {
 
 void ChromeBrowserMainExtraPartsAura::PreEarlyInitialization() {
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
-  if (GetInitialDesktop() != chrome::HOST_DESKTOP_TYPE_ASH) {
+  if (GetInitialDesktop() != ui::HOST_DESKTOP_TYPE_ASH) {
     // TODO(erg): Refactor this into a dlopen call when we add a GTK3 port.
     views::LinuxUI* gtk2_ui = BuildGtk2UI();
     gtk2_ui->SetNativeThemeOverride(base::Bind(&GetNativeThemeForWindow));
@@ -115,7 +115,7 @@ void ChromeBrowserMainExtraPartsAura::ToolkitInitialized() {
 #endif
 
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
-  if (GetInitialDesktop() != chrome::HOST_DESKTOP_TYPE_ASH)
+  if (GetInitialDesktop() != ui::HOST_DESKTOP_TYPE_ASH)
     views::LinuxUI::instance()->Initialize();
 #endif
 }