Convert users of the "get last active browser, get selected tab contents, ope...

chrome/browser/browser.cc

 // Copyright (c) 2006-2009 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/browser.h"
 
 #include "app/animation.h"
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/idle_timer.h"
@@ skipping 562 matching lines @@
                                        transition, false, instance);
     tabstrip_model_.AddTabContents(contents, index, force_index,
                                    transition, foreground);
     // By default, content believes it is not hidden.  When adding contents
     // in the background, tell it that it's hidden.
     if (!foreground)
       contents->WasHidden();
   } else {
     // We're in an app window or a popup window. Find an existing browser to
     // open this URL in, creating one if none exists.
-    Browser* b = GetOrCreateTabbedBrowser();
+    Browser* b = GetOrCreateTabbedBrowser(profile_);
     contents = b->AddTabWithURL(url, referrer, transition, foreground, index,
                                 force_index, instance);
     b->window()->Show();
   }
   return contents;
 }
 
 // TODO(brettw) this should be just AddTab and it should take a TabContents.
 TabContents* Browser::AddTabWithNavigationController(
     NavigationController* ctrl, PageTransition::Type type) {
@@ skipping 231 matching lines @@
 void Browser::CloseWindow() {
   UserMetrics::RecordAction(L"CloseWindow", profile_);
   window_->Close();
 }
 
 void Browser::NewTab() {
   UserMetrics::RecordAction(L"NewTab", profile_);
   if (type() == TYPE_NORMAL) {
     AddBlankTab(true);
   } else {
-    Browser* b = GetOrCreateTabbedBrowser();
+    Browser* b = GetOrCreateTabbedBrowser(profile_);
     b->AddBlankTab(true);
     b->window()->Show();
     // The call to AddBlankTab above did not set the focus to the tab as its
     // window was not active, so we have to do it explicitly.
     // See http://crbug.com/6380.
     b->GetSelectedTabContents()->view()->RestoreFocus();
   }
 }
 
 void Browser::CloseTab() {
@@ skipping 926 matching lines @@
                              bool user_gesture) {
   DCHECK(disposition != SAVE_TO_DISK);  // No code for this yet
   DCHECK(disposition != CURRENT_TAB);  // Can't create a new contents for the
                                        // current tab.
 
   // If this is an application we can only have one tab so we need to process
   // this in tabbed browser window.
   if (tabstrip_model_.count() > 0 &&
       disposition != NEW_WINDOW && disposition != NEW_POPUP &&
       type_ != TYPE_NORMAL) {
-    Browser* b = GetOrCreateTabbedBrowser();
+    Browser* b = GetOrCreateTabbedBrowser(profile_);
     DCHECK(b);
     PageTransition::Type transition = PageTransition::LINK;
     // If we were called from an "installed webapp" we want to emulate the code
     // that is run from browser_init.cc for links from external applications.
     // This means we need to open the tab with the START PAGE transition.
     // AddNewContents doesn't support this but the TabStripModel's
     // AddTabContents method does.
     if (type_ & TYPE_APP)
       transition = PageTransition::START_PAGE;
     b->tabstrip_model()->AddTabContents(new_contents, -1, false, transition,
@@ skipping 785 matching lines @@
   window_->ConfirmBrowserCloseWithPendingDownloads();
 
   // Return false so the browser does not close.  We'll close if the user
   // confirms in the dialog.
   return false;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, Assorted utility functions (private):
 
-Browser* Browser::GetOrCreateTabbedBrowser() {
+// static
+Browser* Browser::GetOrCreateTabbedBrowser(Profile* profile) {
   Browser* browser = BrowserList::FindBrowserWithType(
-      profile_, TYPE_NORMAL);
+      profile, TYPE_NORMAL);
   if (!browser)
-    browser = Browser::Create(profile_);
+    browser = Browser::Create(profile);
   return browser;
 }
 
 void Browser::OpenURLAtIndex(TabContents* source,
                              const GURL& url,
                              const GURL& referrer,
                              WindowOpenDisposition disposition,
                              PageTransition::Type transition,
                              int index,
                              bool force_index) {
@@ skipping 27 matching lines @@
   // only have one tab so a new tab always goes into a tabbed browser window.
   if (disposition != NEW_WINDOW && type_ != TYPE_NORMAL) {
     // If the disposition is OFF_THE_RECORD we don't want to create a new
     // browser that will itself create another OTR browser. This will result in
     // a browser leak (and crash below because no tab is created or selected).
     if (disposition == OFF_THE_RECORD) {
       OpenURLOffTheRecord(profile_, url);
       return;
     }
 
-    Browser* b = GetOrCreateTabbedBrowser();
+    Browser* b = GetOrCreateTabbedBrowser(profile_);
     DCHECK(b);
 
     // If we have just created a new browser window, make sure we select the
     // tab.
     if (b->tab_count() == 0 && disposition == NEW_BACKGROUND_TAB)
       disposition = NEW_FOREGROUND_TAB;
 
     b->OpenURL(url, referrer, disposition, transition);
     b->window()->Show();
     return;
@@ skipping 125 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserToolbarModel (private):
 
 NavigationController* Browser::BrowserToolbarModel::GetNavigationController() {
   // This |current_tab| can be NULL during the initialization of the
   // toolbar during window creation (i.e. before any tabs have been added
   // to the window).
   TabContents* current_tab = browser_->GetSelectedTabContents();
   return current_tab ? &current_tab->controller() : NULL;
 }