Index: chrome/browser/ui/webui/options/browser_options_handler.cc |
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc |
index 1a458caa909d945407383db8567739276d6b4099..b6ab8f42676bc94d16ac26cc45cd1b14966e8938 100644 |
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc |
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc |
@@ -1655,7 +1655,7 @@ void BrowserOptionsHandler::HandleRestartBrowser(const base::ListValue* args) { |
// 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(); |
@@ -2047,8 +2047,8 @@ void BrowserOptionsHandler::SetupProxySettingsSection() { |
// 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 = |
@@ -2074,7 +2074,7 @@ void BrowserOptionsHandler::SetupManageCertificatesSection() { |
// 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); |