Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc

 // Copyright 2014 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/views/apps/chrome_native_app_window_views_win.h"
 
 #include "apps/ui/views/app_window_frame_view.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 26 matching lines @@
 }
 
 ChromeNativeAppWindowViewsWin::~ChromeNativeAppWindowViewsWin() {
 }
 
 void ChromeNativeAppWindowViewsWin::ActivateParentDesktopIfNecessary() {
   // Only switching into Ash from Native is supported. Tearing the user out of
   // Metro mode can only be done by launching a process from Metro mode itself.
   // This is done for launching apps, but not regular activations.
   if (IsRunningInAsh() &&
-      chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_NATIVE) {
+      chrome::GetActiveDesktop() == ui::HOST_DESKTOP_TYPE_NATIVE) {
     chrome::ActivateMetroChrome();
   }
 }
 
 HWND ChromeNativeAppWindowViewsWin::GetNativeAppWindowHWND() const {
   return views::HWNDForWidget(widget()->GetTopLevelWidget());
 }
 
 bool ChromeNativeAppWindowViewsWin::IsRunningInAsh() {
   if (!ash::Shell::HasInstance())
     return false;
 
   views::Widget* widget =
       implicit_cast<views::WidgetDelegate*>(this)->GetWidget();
-  chrome::HostDesktopType host_desktop_type =
+  ui::HostDesktopType host_desktop_type =
       chrome::GetHostDesktopTypeForNativeWindow(widget->GetNativeWindow());
-  return host_desktop_type == chrome::HOST_DESKTOP_TYPE_ASH;
+  return host_desktop_type == ui::HOST_DESKTOP_TYPE_ASH;
 }
 
 void ChromeNativeAppWindowViewsWin::EnsureCaptionStyleSet() {
   // Windows seems to have issues maximizing windows without WS_CAPTION.
   // The default views / Aura implementation will remove this if we are using
   // frameless or colored windows, so we put it back here.
   HWND hwnd = GetNativeAppWindowHWND();
   int current_style = ::GetWindowLong(hwnd, GWL_STYLE);
   ::SetWindowLong(hwnd, GWL_STYLE, current_style | WS_CAPTION);
 }
 
 void ChromeNativeAppWindowViewsWin::OnBeforeWidgetInit(
     const extensions::AppWindow::CreateParams& create_params,
     views::Widget::InitParams* init_params,
     views::Widget* widget) {
   ChromeNativeAppWindowViewsAura::OnBeforeWidgetInit(create_params, init_params,
                                                      widget);
 
   content::BrowserContext* browser_context = app_window()->browser_context();
   std::string extension_id = app_window()->extension_id();
   // If an app has any existing windows, ensure new ones are created on the
   // same desktop.
   extensions::AppWindow* any_existing_window =
       extensions::AppWindowRegistry::Get(browser_context)
           ->GetCurrentAppWindowForApp(extension_id);
-  chrome::HostDesktopType desktop_type;
+  ui::HostDesktopType desktop_type;
   if (any_existing_window) {
     desktop_type = chrome::GetHostDesktopTypeForNativeWindow(
         any_existing_window->GetNativeWindow());
   } else {
     PerAppSettingsService* settings =
         PerAppSettingsServiceFactory::GetForBrowserContext(browser_context);
     if (settings->HasDesktopLastLaunchedFrom(extension_id)) {
       desktop_type = settings->GetDesktopLastLaunchedFrom(extension_id);
     } else {
       // We don't know what desktop this app was last launched from, so take our
       // best guess as to what desktop the user is on.
       desktop_type = chrome::GetActiveDesktop();
     }
   }
-  if (desktop_type == chrome::HOST_DESKTOP_TYPE_ASH)
+  if (desktop_type == ui::HOST_DESKTOP_TYPE_ASH)
     init_params->context = ash::Shell::GetPrimaryRootWindow();
   else
     init_params->native_widget = new AppWindowDesktopNativeWidgetAuraWin(this);
 
   is_translucent_ =
       init_params->opacity == views::Widget::InitParams::TRANSLUCENT_WINDOW;
 }
 
 void ChromeNativeAppWindowViewsWin::InitializeDefaultWindow(
     const extensions::AppWindow::CreateParams& create_params) {
@@ skipping 43 matching lines @@
   ActivateParentDesktopIfNecessary();
   ChromeNativeAppWindowViewsAura::Activate();
 }
 
 bool ChromeNativeAppWindowViewsWin::CanMinimize() const {
   // Resizing on Windows breaks translucency if the window also has shape.
   // See http://crbug.com/417947.
   return ChromeNativeAppWindowViewsAura::CanMinimize() &&
          !(WidgetHasHitTestMask() && is_translucent_);
 }