Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/browser.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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // defined(OS_WIN)
@@ skipping 242 matching lines @@
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableFastUnload);
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // Browser, CreateParams:
 
 Browser::CreateParams::CreateParams(Profile* profile,
-                                    chrome::HostDesktopType host_desktop_type)
+                                    ui::HostDesktopType host_desktop_type)
     : type(TYPE_TABBED),
       profile(profile),
       host_desktop_type(host_desktop_type),
       trusted_source(false),
       initial_show_state(ui::SHOW_STATE_DEFAULT),
       is_session_restore(false),
-      window(NULL) {
-}
+      window(NULL) {}
 
 Browser::CreateParams::CreateParams(Type type,
                                     Profile* profile,
-                                    chrome::HostDesktopType host_desktop_type)
+                                    ui::HostDesktopType host_desktop_type)
     : type(type),
       profile(profile),
       host_desktop_type(host_desktop_type),
       trusted_source(false),
       initial_show_state(ui::SHOW_STATE_DEFAULT),
       is_session_restore(false),
-      window(NULL) {
-}
+      window(NULL) {}
 
 // static
 Browser::CreateParams Browser::CreateParams::CreateForApp(
     const std::string& app_name,
     bool trusted_source,
     const gfx::Rect& window_bounds,
     Profile* profile,
-    chrome::HostDesktopType host_desktop_type) {
+    ui::HostDesktopType host_desktop_type) {
   DCHECK(!app_name.empty());
 
   CreateParams params(TYPE_POPUP, profile, host_desktop_type);
   params.app_name = app_name;
   params.trusted_source = trusted_source;
   params.initial_bounds = window_bounds;
 
   return params;
 }
 
 // static
 Browser::CreateParams Browser::CreateParams::CreateForDevTools(
     Profile* profile,
-    chrome::HostDesktopType host_desktop_type) {
+    ui::HostDesktopType host_desktop_type) {
   CreateParams params(TYPE_POPUP, profile, host_desktop_type);
   params.app_name = DevToolsWindow::kDevToolsApp;
   params.trusted_source = true;
   return params;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Browser, InterstitialObserver:
 
 class Browser::InterstitialObserver : public content::WebContentsObserver {
@@ skipping 296 matching lines @@
     title = CoreTabHelper::GetDefaultTitle();
 
 #if defined(OS_MACOSX)
   // On Mac, we don't want to suffix the page title with
   // the application name.
   return title;
 #elif defined(USE_ASH)
   // On Ash, we don't want to suffix the page title with the application name,
   // but on Windows, where USE_ASH can also be true, we still want the prefix
   // on desktop.
-  if (host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
+  if (host_desktop_type() == ui::HOST_DESKTOP_TYPE_ASH)
     return title;
 #endif
   // Don't append the app name to window titles on app frames and app popups
   return is_app() ?
       title :
       l10n_util::GetStringFUTF16(IDS_BROWSER_WINDOW_TITLE_FORMAT, title);
 }
 
 // static
 void Browser::FormatTitleForDisplay(base::string16* title) {
@@ skipping 2036 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         ui::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }