Move chrome::HostDesktopType to ui::HostDesktopType

chrome/browser/extensions/extension_tab_util.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/extension_tab_util.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
@@ skipping 76 matching lines @@
     *error_message = ErrorUtils::FormatErrorMessage(
         keys::kWindowNotFoundError, base::IntToString(window_id));
 
   return NULL;
 }
 
 Browser* CreateBrowser(ChromeUIThreadExtensionFunction* function,
                        int window_id,
                        std::string* error) {
   content::WebContents* web_contents = function->GetAssociatedWebContents();
-  chrome::HostDesktopType desktop_type =
+  ui::HostDesktopType desktop_type =
       web_contents && web_contents->GetNativeView()
           ? chrome::GetHostDesktopTypeForNativeView(
                 web_contents->GetNativeView())
           : chrome::GetHostDesktopTypeForNativeView(NULL);
   Browser::CreateParams params(
       Browser::TYPE_TABBED, function->GetProfile(), desktop_type);
   Browser* browser = new Browser(params);
   browser->window()->Show();
   return browser;
 }
@@ skipping 106 matching lines @@
   bool pinned = false;
   if (params.pinned.get())
     pinned = *params.pinned;
 
   // We can't load extension URLs into incognito windows unless the extension
   // uses split mode. Special case to fall back to a tabbed window.
   if (url.SchemeIs(kExtensionScheme) &&
       !IncognitoInfo::IsSplitMode(function->extension()) &&
       browser->profile()->IsOffTheRecord()) {
     Profile* profile = browser->profile()->GetOriginalProfile();
-    chrome::HostDesktopType desktop_type = browser->host_desktop_type();
+    ui::HostDesktopType desktop_type = browser->host_desktop_type();
 
     browser = chrome::FindTabbedBrowser(profile, false, desktop_type);
     if (!browser) {
       browser = new Browser(
           Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type));
       browser->window()->Show();
     }
   }
 
   // If index is specified, honor the value, but keep it bound to
@@ skipping 349 matching lines @@
   return false;
 }
 
 void ExtensionTabUtil::CreateTab(WebContents* web_contents,
                                  const std::string& extension_id,
                                  WindowOpenDisposition disposition,
                                  const gfx::Rect& initial_rect,
                                  bool user_gesture) {
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
-  chrome::HostDesktopType active_desktop = chrome::GetActiveDesktop();
+  ui::HostDesktopType active_desktop = chrome::GetActiveDesktop();
   Browser* browser = chrome::FindTabbedBrowser(profile, false, active_desktop);
   const bool browser_created = !browser;
   if (!browser)
     browser = new Browser(Browser::CreateParams(profile, active_desktop));
   chrome::NavigateParams params(browser, web_contents);
 
   // The extension_app_id parameter ends up as app_name in the Browser
   // which causes the Browser to return true for is_app().  This affects
   // among other things, whether the location bar gets displayed.
   // TODO(mpcomplete): This seems wrong. What if the extension content is hosted
@@ skipping 66 matching lines @@
   chrome::ShowSingletonTabOverwritingNTP(browser, params);
   return true;
 }
 
 // static
 bool ExtensionTabUtil::BrowserSupportsTabs(Browser* browser) {
   return browser && browser->tab_strip_model() && !browser->is_devtools();
 }
 
 }  // namespace extensions