Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/views/chrome_views_delegate.cc

Index: chrome/browser/ui/views/chrome_views_delegate.cc
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index 0fc0bbbb98df196ca4925383202f154e24ff0bdd..9c5765d0f92b61887b76306e82e487caf986376e 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -202,7 +202,7 @@ bool ChromeViewsDelegate::GetSavedWindowPlacement(
   // the bounds to fit the work area.
   gfx::NativeView window = widget->GetNativeView();
   if (chrome::GetHostDesktopTypeForNativeView(window) ==
-      chrome::HOST_DESKTOP_TYPE_ASH) {
+      ui::HOST_DESKTOP_TYPE_ASH) {
     gfx::Display display = gfx::Screen::GetScreenFor(window)->
         GetDisplayMatching(*bounds);
     bounds->AdjustToFit(display.work_area());
@@ -284,10 +284,11 @@ void ChromeViewsDelegate::OnBeforeWidgetInit(
   // the side effects are not as bad as the poor window manager interactions. On
   // Windows however these WM interactions are not an issue, so we open windows
   // requested as top_level as actual top level windows on the desktop.
-  use_non_toplevel_window = use_non_toplevel_window &&
+  use_non_toplevel_window =
+      use_non_toplevel_window &&
       (params->child ||
        chrome::GetHostDesktopTypeForNativeView(params->parent) !=
-          chrome::HOST_DESKTOP_TYPE_NATIVE);
+           ui::HOST_DESKTOP_TYPE_NATIVE);
 
   if (!ui::win::IsAeroGlassEnabled()) {
     // If we don't have composition (either because Glass is not enabled or
@@ -302,7 +303,7 @@ void ChromeViewsDelegate::OnBeforeWidgetInit(
     // windows for most things (they get blended via WS_EX_COMPOSITED, which
     // allows for animation effects, but also exceeding the bounds of the parent
     // window).
-    if (chrome::GetActiveDesktop() != chrome::HOST_DESKTOP_TYPE_ASH &&
+    if (chrome::GetActiveDesktop() != ui::HOST_DESKTOP_TYPE_ASH &&
         params->parent &&
         params->type != views::Widget::InitParams::TYPE_CONTROL &&
         params->type != views::Widget::InitParams::TYPE_WINDOW) {
@@ -335,13 +336,13 @@ void ChromeViewsDelegate::OnBeforeWidgetInit(
     // We need to make a decision about where to place this window based on the
     // desktop type.
     switch (chrome::GetActiveDesktop()) {
-      case chrome::HOST_DESKTOP_TYPE_NATIVE:
+      case ui::HOST_DESKTOP_TYPE_NATIVE:
         // If we're native, we should give this window its own toplevel desktop
         // widget.
         params->native_widget = new views::DesktopNativeWidgetAura(delegate);
         break;
 #if defined(USE_ASH)
-      case chrome::HOST_DESKTOP_TYPE_ASH:
+      case ui::HOST_DESKTOP_TYPE_ASH:
         // If we're in ash, give this window the context of the main monitor.
         params->context = ash::Shell::GetPrimaryRootWindow();
         break;
@@ -365,7 +366,7 @@ void ChromeViewsDelegate::OnBeforeWidgetInit(
     gfx::NativeView to_check =
         params->context ? params->context : params->parent;
     if (chrome::GetHostDesktopTypeForNativeView(to_check) ==
-        chrome::HOST_DESKTOP_TYPE_NATIVE) {
+        ui::HOST_DESKTOP_TYPE_NATIVE) {
       params->native_widget = new views::DesktopNativeWidgetAura(delegate);
     }
   }