Move chrome::HostDesktopType to ui::HostDesktopType

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

Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 75d715d3f55ef2f9c409e5ce934258cf209e4044..4c151f8d7e09af5a849305d363202d5647a5c6cf 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -233,7 +233,7 @@ 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),
@@ -244,7 +244,7 @@ void PaintBackgroundAttachedMode(gfx::Canvas* canvas,
                        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.
@@ -268,7 +268,7 @@ void PaintBackgroundAttachedMode(gfx::Canvas* canvas,
 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 =
@@ -695,7 +695,7 @@ void BrowserView::Show() {
   // 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
 
@@ -1708,7 +1708,7 @@ views::View* BrowserView::GetInitiallyFocusedView() {
 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;
@@ -1742,7 +1742,7 @@ gfx::ImageSkia BrowserView::GetWindowIcon() {
 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;
@@ -2369,7 +2369,7 @@ 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;
   }