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 223 matching lines @@
 #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());
 
   if (!new_window)
     new_window = new Browser(params);

[grt (UTC plus 2), 2012/12/03 15:54:39]

specify the same host desktop type here as that used just above.  (i don't
recall seeing calls to "new Browser" on the cleanup list.  if they're not there,
they should be, no?)

[robertshield, 2012/12/03 20:25:58]

ah, good point. We should definitely audit the "new Browser" calls as well.

In this particular case, |params| are being passed in to this function. I'm not
sure that mutating them here to set the host desktop type is the right thing to
do. I think rather I should be using the host desktop type in the given in
|params|. What say you?

   return new_window;
 }
 
 }  // namespace
 
 // Windows ---------------------------------------------------------------------
 
 bool GetWindowFunction::RunImpl() {
   scoped_ptr<Get::Params> params(Get::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
@@ skipping 733 matching lines @@
   // windowId defaults to "current" window.
   int window_id = extension_misc::kCurrentWindowId;
   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.

[grt (UTC plus 2), 2012/12/03 15:54:39]

i haven't studied when this is called, but since |browser| isn't NULL, does it
make sense to use the same desktop type as |browser| here?

[robertshield, 2012/12/03 20:25:58]

You're right, I had missed that this call site would only be reached if we had
already found a browser.

   if (!browser->is_type_tabbed() && browser->IsAttemptingToCloseBrowser())
-    browser = browser::FindTabbedBrowserDeprecated(profile(),
-                                                   include_incognito());
+    browser = browser::FindTabbedBrowser(profile(), include_incognito(),
+                                         chrome::GetActiveDesktop());
 
   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);
+    browser = browser::FindTabbedBrowser(profile, false,
+                                         chrome::GetActiveDesktop());

[grt (UTC plus 2), 2012/12/03 15:54:39]

along similar lines, why not use the same host desktop type as |browser|?

[robertshield, 2012/12/03 20:25:58]

Done.

     if (!browser) {
       browser = new Browser(Browser::CreateParams(profile));

[grt (UTC plus 2), 2012/12/03 15:54:39]

specify the same host desktop type here as that used just above.

[robertshield, 2012/12/03 20:25:58]

Done.

       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()
 }