Add desktop type context to most existing instances of FindTabbedBrowser.

chrome/browser/captive_portal/captive_portal_tab_helper.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/captive_portal/captive_portal_tab_helper.h"
 
 #include "base/bind.h"
 #include "chrome/browser/captive_portal/captive_portal_login_detector.h"
 #include "chrome/browser/captive_portal/captive_portal_tab_reloader.h"
 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
@@ skipping 25 matching lines @@
       profile_(web_contents ? Profile::FromBrowserContext(
                                   web_contents->GetBrowserContext())
                             : NULL),
       tab_reloader_(
           new CaptivePortalTabReloader(
               profile_,
               web_contents,
               base::Bind(&CaptivePortalTabHelper::OpenLoginTab,
                          base::Unretained(this)))),
       login_detector_(new CaptivePortalLoginDetector(profile_)),
+      web_contents_(web_contents),
       pending_error_code_(net::OK),
       provisional_render_view_host_(NULL) {
   registrar_.Add(this,
                  chrome::NOTIFICATION_CAPTIVE_PORTAL_CHECK_RESULT,
                  content::Source<Profile>(profile_));
   registrar_.Add(this,
                  content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT,
                  content::Source<content::WebContents>(web_contents));
   registrar_.Add(this,
                  content::NOTIFICATION_RENDER_VIEW_HOST_DELETED,
@@ skipping 175 matching lines @@
 void CaptivePortalTabHelper::SetTabReloaderForTest(
     CaptivePortalTabReloader* tab_reloader) {
   tab_reloader_.reset(tab_reloader);
 }
 
 CaptivePortalTabReloader* CaptivePortalTabHelper::GetTabReloaderForTest() {
   return tab_reloader_.get();
 }
 
 void CaptivePortalTabHelper::OpenLoginTab() {
-  Browser* browser = browser::FindTabbedBrowser(profile_, true);
+  Browser* browser = browser::FindBrowserWithWebContents(web_contents_);
+
   // If the Profile doesn't have a tabbed browser window open, do nothing.
   if (!browser)
     return;
 
   // Check if the Profile's topmost browser window already has a login tab.
   // If so, do nothing.
   // TODO(mmenke):  Consider focusing that tab, at least if this is the tab
   //                helper for the currently active tab for the profile.
   for (int i = 0; i < browser->tab_count(); ++i) {
     content::WebContents* web_contents = chrome::GetWebContentsAt(browser, i);
     captive_portal::CaptivePortalTabHelper* captive_portal_tab_helper =
         captive_portal::CaptivePortalTabHelper::FromWebContents(web_contents);
     if (captive_portal_tab_helper->IsLoginTab())
       return;
   }
 
   // Otherwise, open a login tab.  Only end up here when a captive portal result
   // was received, so it's safe to assume |profile_| has a CaptivePortalService.
   TabContents* tab_contents = chrome::AddSelectedTabWithURL(
           browser,
           CaptivePortalServiceFactory::GetForProfile(profile_)->test_url(),
           content::PAGE_TRANSITION_TYPED);
   captive_portal::CaptivePortalTabHelper* captive_portal_tab_helper =
       captive_portal::CaptivePortalTabHelper::FromWebContents(
           tab_contents->web_contents());
   captive_portal_tab_helper->SetIsLoginTab();
 }
 
 }  // namespace captive_portal