Remove last usages of FindTabbedBrowserDeprecated.

chrome/browser/extensions/api/tabs/tabs.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.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
@@ skipping 220 matching lines @@
   // In windows 8 metro mode we don't allow windows to be created.
   if (base::win::IsMetroProcess())
     use_existing_browser_window = true;
 #endif  // OS_WIN
 
   Browser* new_window = NULL;
   if (use_existing_browser_window)
     // The false parameter passed below is to ensure that we find a browser
     // object matching the profile passed in, instead of the original profile
     new_window = browser::FindTabbedBrowser(
-        profile, false, chrome::GetActiveDesktop());
+        profile, false, params.host_desktop_type);
 
   if (!new_window)
     new_window = new Browser(params);
   return new_window;
 }
 
 }  // namespace
 
 // Windows ---------------------------------------------------------------------
 
@@ skipping 356 matching lines @@
   if (extension_id.empty()) {
     create_params.initial_bounds = window_bounds;
   } else {
     create_params = Browser::CreateParams::CreateForApp(
         window_type,
         web_app::GenerateApplicationNameFromExtensionId(extension_id),
         window_bounds,
         window_profile);
   }
   create_params.initial_show_state = ui::SHOW_STATE_NORMAL;
+  create_params.host_desktop_type = chrome::GetActiveDesktop();
 
   Browser* new_window = CreateBrowserWindow(create_params, window_profile,
                                             extension_id);
 
   for (std::vector<GURL>::iterator i = urls.begin(); i != urls.end(); ++i) {
     WebContents* tab = chrome::AddSelectedTabWithURL(
         new_window, *i, content::PAGE_TRANSITION_LINK);
     if (window_type == Browser::TYPE_PANEL) {
       extensions::TabHelper::FromWebContents(tab)->
           SetExtensionAppIconById(extension_id);
@@ skipping 362 matching lines @@
   if (args->HasKey(keys::kWindowIdKey))
     EXTENSION_FUNCTION_VALIDATE(args->GetInteger(
         keys::kWindowIdKey, &window_id));
 
   Browser* browser = NULL;
   if (!GetBrowserFromWindowID(this, window_id, &browser))
     return false;
 
   // Ensure the selected browser is tabbed.
   if (!browser->is_type_tabbed() && browser->IsAttemptingToCloseBrowser())
-    browser = browser::FindTabbedBrowserDeprecated(profile(),
-                                                   include_incognito());
+    browser = browser::FindTabbedBrowser(profile(), include_incognito(),
+                                         browser->host_desktop_type());
 
   if (!browser || !browser->window())
     return false;
 
   // TODO(jstritar): Add a constant, chrome.tabs.TAB_ID_ACTIVE, that
   // represents the active tab.
   WebContents* opener = NULL;
   if (args->HasKey(keys::kOpenerTabIdKey)) {
     int opener_id = -1;
     EXTENSION_FUNCTION_VALIDATE(args->GetInteger(
@@ skipping 45 matching lines @@
   bool pinned = false;
   if (args->HasKey(keys::kPinnedKey))
     EXTENSION_FUNCTION_VALIDATE(args->GetBoolean(keys::kPinnedKey, &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(extensions::kExtensionScheme) &&
       !GetExtension()->incognito_split_mode() &&
       browser->profile()->IsOffTheRecord()) {
     Profile* profile = browser->profile()->GetOriginalProfile();
-    browser = browser::FindTabbedBrowserDeprecated(profile, false);
+    chrome::HostDesktopType desktop_type = browser->host_desktop_type();
+
+    browser = browser::FindTabbedBrowser(profile, false, desktop_type);
     if (!browser) {
-      browser = new Browser(Browser::CreateParams(profile));
+      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
   // -1 <= index <= tab_strip->count() where -1 invokes the default behavior.
   int index = -1;
   if (args->HasKey(keys::kIndexKey))
     EXTENSION_FUNCTION_VALIDATE(args->GetInteger(keys::kIndexKey, &index));
 
@@ skipping 790 matching lines @@
   // called for every API call the extension made.
   GotLanguage(language);
 }
 
 void DetectTabLanguageFunction::GotLanguage(const std::string& language) {
   SetResult(Value::CreateStringValue(language.c_str()));
   SendResponse(true);
 
   Release();  // Balanced in Run()
 }