Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/toolbar/wrench_menu_model.cc

Index: chrome/browser/ui/toolbar/wrench_menu_model.cc
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index 625359402eed4d5f58e83ab2bd64939c0aca0cb5..6b68b10f21195dd427dade5bd93c41af8bcd8787 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -104,12 +104,12 @@ base::string16 GetUpgradeDialogMenuItemName() {
 }
 
 #if defined(OS_WIN)
-bool GetRestartMenuItemIfRequired(const chrome::HostDesktopType& desktop_type,
+bool GetRestartMenuItemIfRequired(const ui::HostDesktopType& desktop_type,
                                   int* command_id,
                                   int* string_id) {
   if (base::win::GetVersion() == base::win::VERSION_WIN8 ||
       base::win::GetVersion() == base::win::VERSION_WIN8_1) {
-    if (desktop_type != chrome::HOST_DESKTOP_TYPE_ASH) {
+    if (desktop_type != ui::HOST_DESKTOP_TYPE_ASH) {
       *command_id = IDC_WIN8_METRO_RESTART;
       *string_id = IDS_WIN8_METRO_RESTART;
     } else {
@@ -125,7 +125,7 @@ bool GetRestartMenuItemIfRequired(const chrome::HostDesktopType& desktop_type,
   // GPU compositor.
   if (base::win::GetVersion() == base::win::VERSION_WIN7 &&
       content::GpuDataManager::GetInstance()->CanUseGpuBrowserCompositor()) {
-    if (desktop_type != chrome::HOST_DESKTOP_TYPE_ASH) {
+    if (desktop_type != ui::HOST_DESKTOP_TYPE_ASH) {
       *command_id = IDC_WIN_CHROMEOS_RESTART;
       *string_id = IDS_WIN_CHROMEOS_RESTART;
     } else {
@@ -284,7 +284,7 @@ void ToolsMenuModel::Build(Browser* browser) {
 #if defined(OS_CHROMEOS) || defined(OS_MACOSX)
   show_create_shortcuts = false;
 #elif defined(USE_ASH)
-  if (browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
+  if (browser->host_desktop_type() == ui::HOST_DESKTOP_TYPE_ASH)
     show_create_shortcuts = false;
 #endif
   AddItemWithStringId(IDC_SAVE_PAGE, IDS_SAVE_PAGE);
@@ -297,7 +297,7 @@ void ToolsMenuModel::Build(Browser* browser) {
     int string_id = IDS_ADD_TO_DESKTOP;
 #endif
 #if defined(USE_ASH)
-    if (browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
+    if (browser->host_desktop_type() == ui::HOST_DESKTOP_TYPE_ASH)
       string_id = IDS_ADD_TO_SHELF;
 #endif
     AddItemWithStringId(IDC_CREATE_HOSTED_APP, string_id);
@@ -931,7 +931,7 @@ void WrenchMenuModel::Build() {
 #endif
   bool show_exit_menu = browser_defaults::kShowExitMenuItem;
 #if defined(OS_WIN)
-  if (browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH)
+  if (browser_->host_desktop_type() == ui::HOST_DESKTOP_TYPE_ASH)
     show_exit_menu = false;
 #endif
   if (show_exit_menu) {