Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/ui/toolbar/wrench_menu_model.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/toolbar/wrench_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
@@ skipping 86 matching lines @@
 base::string16 GetUpgradeDialogMenuItemName() {
   if (UpgradeDetector::GetInstance()->is_outdated_install() ||
       UpgradeDetector::GetInstance()->is_outdated_install_no_au()) {
     return l10n_util::GetStringUTF16(IDS_UPGRADE_BUBBLE_MENU_ITEM);
   } else {
     return l10n_util::GetStringUTF16(IDS_UPDATE_NOW);
   }
 }
 
 #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 {
       *command_id = IDC_WIN_DESKTOP_RESTART;
       *string_id = IDS_WIN_DESKTOP_RESTART;
     }
     return true;
   }
 
   // Windows 7 ASH mode is only supported in DEBUG for now.
 #if !defined(NDEBUG)
   // Windows 8 can support ASH mode using WARP, but Windows 7 requires a working
   // 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 {
       *command_id = IDC_WIN_DESKTOP_RESTART;
       *string_id = IDS_WIN_DESKTOP_RESTART;
     }
     return true;
   }
 #endif
   return false;
@@ skipping 138 matching lines @@
 // More tools submenu is constructed as follows:
 // - Page specific actions overflow (save page, adding to taskbar).
 // - Browser / OS level tools (extensions, task manager).
 // - Developer tools.
 // - Option to enable profiling.
 void ToolsMenuModel::Build(Browser* browser) {
   bool show_create_shortcuts = true;
 #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);
   if (extensions::util::IsNewBookmarkAppsEnabled()) {
 #if defined(OS_MACOSX)
     int string_id = IDS_ADD_TO_APPLICATIONS;
 #elif defined(OS_WIN)
     int string_id = IDS_ADD_TO_TASKBAR;
 #else
     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);
   } else if (show_create_shortcuts) {
     AddItemWithStringId(IDC_CREATE_SHORTCUTS, IDS_CREATE_SHORTCUTS);
   }
 
   AddSeparator(ui::NORMAL_SEPARATOR);
   AddItemWithStringId(IDC_CLEAR_BROWSING_DATA, IDS_CLEAR_BROWSING_DATA);
   AddItemWithStringId(IDC_MANAGE_EXTENSIONS, IDS_SHOW_EXTENSIONS);
@@ skipping 613 matching lines @@
   int string_id = IDS_WIN_DESKTOP_RESTART;
   if (GetRestartMenuItemIfRequired(browser_->host_desktop_type(),
                                    &command_id,
                                    &string_id)) {
     AddSeparator(ui::NORMAL_SEPARATOR);
     AddItemWithStringId(command_id, string_id);
   }
 #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) {
     AddSeparator(ui::NORMAL_SEPARATOR);
     AddItemWithStringId(IDC_EXIT, IDS_EXIT);
   }
   uma_action_recorded_ = false;
 }
 
 bool WrenchMenuModel::AddGlobalErrorMenuItems() {
@@ skipping 79 matching lines @@
                        ->GetZoomPercent();
   }
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
 void WrenchMenuModel::OnZoomLevelChanged(
     const content::HostZoomMap::ZoomLevelChange& change) {
   UpdateZoomControls();
 }