Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/webui/options/browser_options_handler.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/webui/options/browser_options_handler.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 1637 matching lines @@
   }
 }
 
 void BrowserOptionsHandler::HandleRestartBrowser(const base::ListValue* args) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // If hardware acceleration is disabled then we need to force restart
   // browser in desktop mode.
   // TODO(shrikant): Remove this once we fix start mode logic for browser.
   // Currently there are issues with determining correct browser mode
   // at startup.
-  if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) {
+  if (chrome::GetActiveDesktop() == ui::HOST_DESKTOP_TYPE_ASH) {
     PrefService* pref_service = g_browser_process->local_state();
     if (!pref_service->GetBoolean(prefs::kHardwareAccelerationModeEnabled)) {
       chrome::AttemptRestartToDesktopMode();
       return;
     }
   }
 #endif
 
 #if defined(OS_WIN)
   // On Windows Breakpad will upload crash reports if the breakpad pipe name
@@ skipping 371 matching lines @@
 }
 
 void BrowserOptionsHandler::SetupProxySettingsSection() {
 #if !defined(OS_CHROMEOS)
   // Disable the button if proxy settings are managed by a sysadmin, overridden
   // by an extension, or the browser is running in Windows Ash (on Windows the
   // proxy settings dialog will open on the Windows desktop and be invisible
   // to a user in Ash).
   bool is_win_ash = false;
 #if defined(OS_WIN)
-  chrome::HostDesktopType desktop_type = helper::GetDesktopType(web_ui());
-  is_win_ash = (desktop_type == chrome::HOST_DESKTOP_TYPE_ASH);
+  ui::HostDesktopType desktop_type = helper::GetDesktopType(web_ui());
+  is_win_ash = (desktop_type == ui::HOST_DESKTOP_TYPE_ASH);
 #endif
   PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
   const PrefService::Preference* proxy_config =
       pref_service->FindPreference(proxy_config::prefs::kProxy);
   bool is_extension_controlled = (proxy_config &&
                                   proxy_config->IsExtensionControlled());
 
   base::FundamentalValue disabled(is_win_ash || (proxy_config &&
                                   !proxy_config->IsUserModifiable()));
   base::FundamentalValue extension_controlled(is_extension_controlled);
   web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsButton",
                                    disabled, extension_controlled);
 
 #if defined(OS_WIN)
   SetupExtensionControlledIndicators();
 #endif  // defined(OS_WIN)
 
 #endif  // !defined(OS_CHROMEOS)
 }
 
 void BrowserOptionsHandler::SetupManageCertificatesSection() {
 #if defined(OS_WIN)
   // Disable the button if the settings page is displayed in Windows Ash,
   // otherwise the proxy settings dialog will open on the Windows desktop and
   // be invisible to a user in Ash.
-  if (helper::GetDesktopType(web_ui()) == chrome::HOST_DESKTOP_TYPE_ASH) {
+  if (helper::GetDesktopType(web_ui()) == ui::HOST_DESKTOP_TYPE_ASH) {
     base::FundamentalValue enabled(false);
     web_ui()->CallJavascriptFunction("BrowserOptions.enableCertificateButton",
                                      enabled);
   }
 #endif  // defined(OS_WIN)
 }
 
 void BrowserOptionsHandler::SetupManagingSupervisedUsers() {
   bool has_users = !Profile::FromWebUI(web_ui())->
       GetPrefs()->GetDictionary(prefs::kSupervisedUsers)->empty();
@@ skipping 95 matching lines @@
 void BrowserOptionsHandler::OnPolicyUpdated(const policy::PolicyNamespace& ns,
                                             const policy::PolicyMap& previous,
                                             const policy::PolicyMap& current) {
   std::set<std::string> different_keys;
   current.GetDifferingKeys(previous, &different_keys);
   if (ContainsKey(different_keys, policy::key::kMetricsReportingEnabled))
     SetupMetricsReportingCheckbox();
 }
 
 }  // namespace options