Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/views/chrome_views_delegate.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/views/chrome_views_delegate.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_util.h"
@@ skipping 184 matching lines @@
   bool maximized = false;
   if (dictionary)
     dictionary->GetBoolean("maximized", &maximized);
   *show_state = maximized ? ui::SHOW_STATE_MAXIMIZED : ui::SHOW_STATE_NORMAL;
 
 #if defined(USE_ASH)
   // On Ash environment, a window won't span across displays.  Adjust
   // 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());
     ash::wm::GetWindowState(window)->set_minimum_visibility(true);
   }
 #endif
   return true;
 }
 
 void ChromeViewsDelegate::NotifyAccessibilityEvent(
@@ skipping 61 matching lines @@
 #if defined(OS_WIN)
   // On desktop Linux Chrome must run in an environment that supports a variety
   // of window managers, some of which do not play nicely with parts of our UI
   // that have specific expectations about window sizing and placement. For this
   // reason windows opened as top level (!params.child) are always constrained
   // by the browser frame, so we can position them correctly. This has some
   // negative side effects, like dialogs being clipped by the browser frame, but
   // 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
     // because it was disabled at the command line), anything that requires
     // transparency will be broken with a toplevel window, so force the use of
     // a non toplevel window.
     if (params->opacity == views::Widget::InitParams::TRANSLUCENT_WINDOW &&
         params->type != views::Widget::InitParams::TYPE_MENU)
       use_non_toplevel_window = true;
   } else {
     // If we're on Vista+ with composition enabled, then we can use toplevel
     // 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) {
       // When we set this to false, we get a DesktopNativeWidgetAura from the
       // default case (not handled in this function).
       use_non_toplevel_window = false;
     }
   }
 #endif  // OS_WIN
 #endif  // USE_AURA
@@ skipping 12 matching lines @@
   if (!params->parent && !params->context)
     params->context = ash::Shell::GetPrimaryRootWindow();
 #elif defined(USE_AURA)
   // While the majority of the time, context wasn't plumbed through due to the
   // existence of a global WindowTreeClient, if this window is toplevel, it's
   // possible that there is no contextual state that we can use.
   if (params->parent == NULL && params->context == NULL && !params->child) {
     // 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;
 #endif
       default:
         NOTREACHED();
     }
   } else if (use_non_toplevel_window) {
     views::NativeWidgetAura* native_widget =
         new views::NativeWidgetAura(delegate);
     if (params->parent) {
       Profile* parent_profile = reinterpret_cast<Profile*>(
           params->parent->GetNativeWindowProperty(Profile::kProfileKey));
       native_widget->SetNativeWindowProperty(Profile::kProfileKey,
                                              parent_profile);
     }
     params->native_widget = native_widget;
   } else {
     // TODO(erg): Once we've threaded context to everywhere that needs it, we
     // should remove this check here.
     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);
     }
   }
 #endif
 }
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 bool ChromeViewsDelegate::WindowManagerProvidesTitleBar(bool maximized) {
   // On Ubuntu Unity, the system always provides a title bar for maximized
   // windows.
@@ skipping 55 matching lines @@
   return content::BrowserThread::GetBlockingPool();
 }
 
 #if !defined(USE_AURA) && !defined(USE_CHROMEOS)
 views::Widget::InitParams::WindowOpacity
 ChromeViewsDelegate::GetOpacityForInitParams(
     const views::Widget::InitParams& params) {
   return views::Widget::InitParams::OPAQUE_WINDOW;
 }
 #endif