Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 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/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 215 matching lines @@
       view->GetLocalBounds());
 }
 
 // Paints the background (including the theme image behind content area) for
 // the Bookmarks Bar when it is attached to the Toolbar into |bounds|.
 // |background_origin| is the origin to use for painting the theme image.
 void PaintBackgroundAttachedMode(gfx::Canvas* canvas,
                                  ui::ThemeProvider* theme_provider,
                                  const gfx::Rect& bounds,
                                  const gfx::Point& background_origin,
-                                 chrome::HostDesktopType host_desktop_type) {
+                                 ui::HostDesktopType host_desktop_type) {
   canvas->FillRect(bounds,
                    theme_provider->GetColor(ThemeProperties::COLOR_TOOLBAR));
   canvas->TileImageInt(*theme_provider->GetImageSkiaNamed(IDR_THEME_TOOLBAR),
                        background_origin.x(),
                        background_origin.y(),
                        bounds.x(),
                        bounds.y(),
                        bounds.width(),
                        bounds.height());
 
-  if (host_desktop_type == chrome::HOST_DESKTOP_TYPE_ASH &&
+  if (host_desktop_type == ui::HOST_DESKTOP_TYPE_ASH &&
       !ui::MaterialDesignController::IsModeMaterial()) {
     // The pre-material design version of Ash provides additional lightening
     // at the edges of the toolbar.
     gfx::ImageSkia* toolbar_left =
         theme_provider->GetImageSkiaNamed(IDR_TOOLBAR_SHADE_LEFT);
     canvas->TileImageInt(*toolbar_left,
                          bounds.x(),
                          bounds.y(),
                          toolbar_left->width(),
                          bounds.height());
     gfx::ImageSkia* toolbar_right =
         theme_provider->GetImageSkiaNamed(IDR_TOOLBAR_SHADE_RIGHT);
     canvas->TileImageInt(*toolbar_right,
                          bounds.right() - toolbar_right->width(),
                          bounds.y(),
                          toolbar_right->width(),
                          bounds.height());
   }
 }
 
 void PaintAttachedBookmarkBar(gfx::Canvas* canvas,
                               BookmarkBarView* view,
                               BrowserView* browser_view,
-                              chrome::HostDesktopType host_desktop_type,
+                              ui::HostDesktopType host_desktop_type,
                               int toolbar_overlap) {
   // Paint background for attached state, this is fade in/out.
   gfx::Point background_image_offset =
       browser_view->OffsetPointForToolbarBackgroundImage(
           gfx::Point(view->GetMirroredX(), view->y()));
   PaintBackgroundAttachedMode(canvas,
                               view->GetThemeProvider(),
                               view->GetLocalBounds(),
                               background_image_offset,
                               host_desktop_type);
@@ skipping 406 matching lines @@
 
 void BrowserView::Show() {
 #if !defined(OS_WIN)
   // The Browser associated with this browser window must become the active
   // browser at the time |Show()| is called. This is the natural behavior under
   // Windows and Ash, but other platforms will not trigger
   // OnWidgetActivationChanged() until we return to the runloop. Therefore any
   // calls to Browser::GetLastActive() will return the wrong result if we do not
   // explicitly set it here.
   // A similar block also appears in BrowserWindowCocoa::Show().
-  if (browser()->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH)
+  if (browser()->host_desktop_type() != ui::HOST_DESKTOP_TYPE_ASH)
     BrowserList::SetLastActive(browser());
 #endif
 
   // If the window is already visible, just activate it.
   if (frame_->IsVisible()) {
     frame_->Activate();
     return;
   }
 
   // Showing the window doesn't make the browser window active right away.
@@ skipping 992 matching lines @@
   return GetWindowTitle();
 }
 
 views::View* BrowserView::GetInitiallyFocusedView() {
   return nullptr;
 }
 
 bool BrowserView::ShouldShowWindowTitle() const {
   // For Ash only, trusted windows (apps and settings) do not show a title,
   // crbug.com/119411. Child windows (i.e. popups) do show a title.
-  if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH &&
+  if (browser_->host_desktop_type() == ui::HOST_DESKTOP_TYPE_ASH &&
       browser_->is_trusted_source() &&
       !browser_->SupportsWindowFeature(Browser::FEATURE_WEBAPPFRAME))
     return false;
 
   return browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR);
 }
 
 gfx::ImageSkia BrowserView::GetWindowAppIcon() {
   if (browser_->is_app()) {
     WebContents* contents = browser_->tab_strip_model()->GetActiveWebContents();
@@ skipping 13 matching lines @@
     return gfx::ImageSkia();
 
   if (browser_->is_app() || browser_->is_type_popup())
     return browser_->GetCurrentPageIcon().AsImageSkia();
   return gfx::ImageSkia();
 }
 
 bool BrowserView::ShouldShowWindowIcon() const {
   // For Ash only, trusted windows (apps and settings) do not show an icon,
   // crbug.com/119411. Child windows (i.e. popups) do show an icon.
-  if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH &&
+  if (browser_->host_desktop_type() == ui::HOST_DESKTOP_TYPE_ASH &&
       browser_->is_trusted_source() &&
       !browser_->SupportsWindowFeature(Browser::FEATURE_WEBAPPFRAME))
     return false;
 
   return browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR);
 }
 
 bool BrowserView::ExecuteWindowsCommand(int command_id) {
   // This function handles WM_SYSCOMMAND, WM_APPCOMMAND, and WM_COMMAND.
 #if defined(OS_WIN)
@@ skipping 606 matching lines @@
 
   WebContents* contents = browser_->tab_strip_model()->GetActiveWebContents();
   if (contents && PermissionBubbleManager::FromWebContents(contents))
     PermissionBubbleManager::FromWebContents(contents)->UpdateAnchorPosition();
 }
 
 bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
   // Kiosk mode needs the whole screen, and if we're not in an Ash desktop
   // immersive fullscreen doesn't exist.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode) ||
-      browser()->host_desktop_type() != chrome::HOST_DESKTOP_TYPE_ASH) {
+      browser()->host_desktop_type() != ui::HOST_DESKTOP_TYPE_ASH) {
     return false;
   }
 
   return url.is_empty();
 }
 
 void BrowserView::LoadAccelerators() {
   views::FocusManager* focus_manager = GetFocusManager();
   DCHECK(focus_manager);
 
@@ skipping 251 matching lines @@
   return immersive_mode_controller()->IsEnabled();
 }
 
 views::Widget* BrowserView::GetBubbleAssociatedWidget() {
   return GetWidget();
 }
 
 gfx::Rect BrowserView::GetTopContainerBoundsInScreen() {
   return top_container_->GetBoundsInScreen();
 }