Remove HostDesktopType from Browser::CreateParams

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 <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 77 matching lines @@
   if (error_message)
     *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 =
-      web_contents && web_contents->GetNativeView()
-          ? chrome::GetHostDesktopTypeForNativeView(
-                web_contents->GetNativeView())
-          : chrome::GetHostDesktopTypeForNativeView(NULL);
-  Browser::CreateParams params(
-      Browser::TYPE_TABBED, function->GetProfile(), desktop_type);
+  Browser::CreateParams params(Browser::TYPE_TABBED, function->GetProfile());
   Browser* browser = new Browser(params);
   browser->window()->Show();
   return browser;
 }
 
 // Use this function for reporting a tab id to an extension. It will
 // take care of setting the id to TAB_ID_NONE if necessary (for
 // example with devtools).
 int GetTabIdForExtensions(const WebContents* web_contents) {
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
@@ skipping 98 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();
 
     browser = chrome::FindTabbedBrowser(profile, false);
     if (!browser) {
-      browser = new Browser(
-          Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type));
+      browser =
+          new Browser(Browser::CreateParams(Browser::TYPE_TABBED, profile));
       browser->window()->Show();
     }
   }
 
   // If index is specified, honor the value, but keep it bound to
   // -1 <= index <= tab_strip->count() where -1 invokes the default behavior.
   int index = -1;
   if (params.index.get())
     index = *params.index;
 
@@ skipping 343 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();
   Browser* browser = chrome::FindTabbedBrowser(profile, false);
   const bool browser_created = !browser;
   if (!browser)
-    browser = new Browser(Browser::CreateParams(profile, active_desktop));
+    browser = new Browser(Browser::CreateParams(profile));
   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
   // in a tab?
   if (disposition == NEW_POPUP)
     params.extension_app_id = extension_id;
 
@@ skipping 28 matching lines @@
 bool ExtensionTabUtil::OpenOptionsPage(const Extension* extension,
                                        Browser* browser) {
   if (!OptionsPageInfo::HasOptionsPage(extension))
     return false;
 
   // Force the options page to open in non-OTR window, because it won't be
   // able to save settings from OTR.
   scoped_ptr<chrome::ScopedTabbedBrowserDisplayer> displayer;
   if (browser->profile()->IsOffTheRecord()) {
     displayer.reset(new chrome::ScopedTabbedBrowserDisplayer(
-        browser->profile()->GetOriginalProfile(),
-        browser->host_desktop_type()));
+        browser->profile()->GetOriginalProfile()));
     browser = displayer->browser();
   }
 
   GURL url_to_navigate;
   if (OptionsPageInfo::ShouldOpenInTab(extension)) {
     // Options page tab is simply e.g. chrome-extension://.../options.html.
     url_to_navigate = OptionsPageInfo::GetOptionsPage(extension);
   } else {
     // Options page tab is Extension settings pointed at that Extension's ID,
     // e.g. chrome://extensions?options=...
@@ skipping 12 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