Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

 // Copyright (c) 2012 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/aura/chrome_browser_main_extra_parts_aura.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/ui/aura/active_desktop_monitor.h"
@@ skipping 46 matching lines @@
 
   if (profile && !profile->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme))
     return ui::NativeThemeAura::instance();
 
   return NULL;
 }
 #endif
 
 #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)
 
 }  // namespace
 
 ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura() {
 }
 
 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));
     views::LinuxUI::SetInstance(gtk2_ui);
   } else {
     // TODO(erg): Eventually, we'll need to somehow support IMEs in ash on
     // Linux.
     ui::InitializeInputMethodForTesting();
   }
 #endif
 }
 
 void ChromeBrowserMainExtraPartsAura::ToolkitInitialized() {
 #if !defined(OS_CHROMEOS)
 #if defined(USE_ASH)
   CHECK(aura::Env::GetInstance());
   active_desktop_monitor_.reset(new ActiveDesktopMonitor(GetInitialDesktop()));
 #endif
 #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
 }
 
 void ChromeBrowserMainExtraPartsAura::PreCreateThreads() {
 #if !defined(OS_CHROMEOS)
 #if defined(USE_ASH)
   if (!chrome::ShouldOpenAshOnStartup())
 #endif
   {
@@ skipping 43 matching lines @@
                            chrome::MESSAGE_BOX_TYPE_WARNING);
 
     // Avoids gpu_process_transport_factory.cc(153)] Check failed:
     // per_compositor_data_.empty() when quit is chosen.
     base::RunLoop().RunUntilIdle();
 
     exit(EXIT_FAILURE);
   }
 }
 #endif