This changelist represents the necessary merger of two others:...

chrome/browser/browser.h

 // 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.
 
 #ifndef CHROME_BROWSER_BROWSER_H_
 #define CHROME_BROWSER_BROWSER_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 385 matching lines @@
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Returns the Browser which contains the tab with the given
   // NavigationController, also filling in |index| (if valid) with the tab's
   // index in the tab strip.
   // Returns NULL if not found.
   // This call is O(N) in the number of tabs.
   static Browser* GetBrowserForController(
       const NavigationController* controller, int* index);
 
+  // Retrieve the last active tabbed browser with a profile matching |profile|.
+  // Creates a new Browser if none are available.
+  static Browser* GetOrCreateTabbedBrowser(Profile* profile);
 
   // Helper function to create a new popup window.
   static void BuildPopupWindowHelper(TabContents* source,
                                      TabContents* new_contents,
                                      const gfx::Rect& initial_pos,
                                      Browser::Type browser_type,
                                      Profile* profile,
                                      bool honor_saved_maximized_state);
 
   // Calls ExecuteCommandWithDisposition with the given disposition.
@@ skipping 190 matching lines @@
 
   // In-progress download termination handling /////////////////////////////////
 
   // Called when the window is closing to check if potential in-progress
   // downloads should prevent it from closing.
   // Returns true if the window can close, false otherwise.
   bool CanCloseWithInProgressDownloads();
 
   // Assorted utility functions ///////////////////////////////////////////////
 
-  // Retrieve the last active tabbed browser with the same profile as the
-  // receiving Browser. Creates a new Browser if none are available.
-  Browser* GetOrCreateTabbedBrowser();
-
   // The low-level function that other OpenURL...() functions call.  This
   // determines the appropriate SiteInstance to pass to AddTabWithURL(), focuses
   // the newly created tab as needed, and does other miscellaneous housekeeping.
   void OpenURLAtIndex(TabContents* source,
                       const GURL& url,
                       const GURL& referrer,
                       WindowOpenDisposition disposition,
                       PageTransition::Type transition,
                       int index,
                       bool force_index);
@@ skipping 143 matching lines @@
   // The browser idle task helps cleanup unused memory resources when idle.
   scoped_ptr<BrowserIdleTimer> idle_task_;
 
   // Keep track of the encoding auto detect pref.
   BooleanPrefMember encoding_auto_detect_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_H_