Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/extensions/api/tabs/tabs_api.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/extensions/api/tabs/tabs_api.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
@@ skipping 499 matching lines @@
         window_type = Browser::TYPE_POPUP;
         extension_id = extension()->id();
         break;
       case windows::CREATE_TYPE_PANEL:
       case windows::CREATE_TYPE_DETACHED_PANEL: {
         extension_id = extension()->id();
         bool use_panels = PanelManager::ShouldUsePanels(extension_id);
         if (use_panels) {
           create_panel = true;
           // Non-ash supports both docked and detached panel types.
-          if (chrome::GetActiveDesktop() != chrome::HOST_DESKTOP_TYPE_ASH &&
+          if (chrome::GetActiveDesktop() != ui::HOST_DESKTOP_TYPE_ASH &&
               create_data->type == windows::CREATE_TYPE_DETACHED_PANEL) {
             panel_create_mode = PanelManager::CREATE_AS_DETACHED;
           }
         } else {
           window_type = Browser::TYPE_POPUP;
         }
         break;
       }
       case windows::CREATE_TYPE_NONE:
       case windows::CREATE_TYPE_NORMAL:
@@ skipping 44 matching lines @@
       focused = *create_data->focused;
       saw_focus_key = true;
     }
   }
 
   if (create_panel) {
     if (urls.empty())
       urls.push_back(GURL(chrome::kChromeUINewTabURL));
 
 #if defined(USE_ASH)
-    if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) {
+    if (chrome::GetActiveDesktop() == ui::HOST_DESKTOP_TYPE_ASH) {
       AppWindow::CreateParams create_params;
       create_params.window_type = AppWindow::WINDOW_TYPE_V1_PANEL;
       create_params.window_key = extension_id;
       create_params.window_spec.bounds = window_bounds;
       create_params.focused = saw_focus_key && focused;
       AppWindow* app_window = new AppWindow(
           window_profile,
           new ChromeAppDelegate(make_scoped_ptr(new ScopedKeepAlive)),
           extension());
       AshPanelContents* ash_panel_contents = new AshPanelContents(app_window);
@@ skipping 18 matching lines @@
       panel->ShowInactive();
     else
       panel->Show();
 
     SetResult(panel->extension_window_controller()->CreateWindowValueWithTabs(
         extension()));
     return true;
   }
 
   // Create a new BrowserWindow.
-  chrome::HostDesktopType host_desktop_type = chrome::GetActiveDesktop();
+  ui::HostDesktopType host_desktop_type = chrome::GetActiveDesktop();
   if (create_panel)
     window_type = Browser::TYPE_POPUP;
   Browser::CreateParams create_params(window_type, window_profile,
                                       host_desktop_type);
   if (extension_id.empty()) {
     create_params.initial_bounds = window_bounds;
   } else {
     create_params = Browser::CreateParams::CreateForApp(
         web_app::GenerateApplicationNameFromExtensionId(extension_id),
         false /* trusted_source */,
@@ skipping 1414 matching lines @@
   ZoomModeToZoomSettings(zoom_mode, &zoom_settings);
   zoom_settings.default_zoom_factor.reset(new double(
       content::ZoomLevelToZoomFactor(zoom_controller->GetDefaultZoomLevel())));
 
   results_ = api::tabs::GetZoomSettings::Results::Create(zoom_settings);
   SendResponse(true);
   return true;
 }
 
 }  // namespace extensions