Removal of TabContentsDelegate::GetBrowser() interface method

chrome/browser/browser.h

 // Copyright (c) 2010 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_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 209 matching lines @@
   // or NULL.
   static TabContents* OpenApplication(Profile* profile,
                                       Extension* extension,
                                       Extension::LaunchContainer container);
 
   // Opens a new application window for the specified url. If |as_panel|
   // is true, the application will be opened as a Browser::Type::APP_PANEL in
   // app panel window, otherwise it will be opened as as either
   // Browser::Type::APP a.k.a. "thin frame" (if |extension| is NULL) or
   // Browser::Type::EXTENSION_APP (if |extension| is non-NULL).
+  // Returns the browser hosting for the TabContents via optional parameter,
+  // |browser|.
   static TabContents* OpenApplicationWindow(
       Profile* profile,
       Extension* extension,
       Extension::LaunchContainer container,
-      const GURL& url);
+      const GURL& url,
+      Browser** browser);
 
   // Open an application for |extension| in a new application window or panel.
+  // Returns the browser hosting the TabContents via optional parameter,
+  // |browser|.
   static TabContents* OpenApplicationWindow(Profile* profile,
-                                            GURL& url);
+                                            GURL& url,
+                                            Browser** browser);
 
   // Open an application for |extension| in a new application tab.  Returns
   // NULL if there are no appropriate existing browser windows for |profile|.
+  // Returns the browser hosting the TabContents via optional parameter,
+  // |browser|.
   static TabContents* OpenApplicationTab(Profile* profile,
-                                         Extension* extension);
+                                         Extension* extension,
+                                         Browser** browser);
 
   // Opens a new window and opens the bookmark manager.
   static void OpenBookmarkManagerWindow(Profile* profile);
 
 #if defined(OS_MACOSX)
   // Open a new window with history/downloads/help/options (needed on Mac when
   // there are no windows).
   static void OpenHistoryWindow(Profile* profile);
   static void OpenDownloadsWindow(Profile* profile);
   static void OpenHelpWindow(Profile* profile);
@@ skipping 72 matching lines @@
   // Returns the index to insert a tab at during session restore and startup.
   // |relative_index| gives the index of the url into the number of tabs that
   // are going to be opened. For example, if three urls are passed in on the
   // command line this is invoked three times with the values 0, 1 and 2.
   int GetIndexForInsertionDuringRestore(int relative_index);
 
   // Adds a new tab at the specified index. |add_types| is a bitmask of the
   // values defined by TabStripModel::AddTabTypes; see it for details. If
   // |instance| is not null, its process will be used to render the tab. If
   // |extension_app_id| is non-empty the new tab is an app tab.
+  // The returned tab may be hosted in a different browser.  |browser_used|
+  // will be assigned the browser that satisfied the add tab request.
+  // |browser_used| may be passed
   TabContents* AddTabWithURL(const GURL& url,
                              const GURL& referrer,
                              PageTransition::Type transition,
                              int index,
                              int add_types,
                              SiteInstance* instance,
-                             const std::string& extension_app_id);
+                             const std::string& extension_app_id,
+                             Browser** browser_used);
 
   // Add a new tab, given a TabContents. A TabContents appropriate to
   // display the last committed entry is created and returned.
   TabContents* AddTab(TabContents* tab_contents, PageTransition::Type type);
 
   // Add a tab with its session history restored from the SessionRestore
   // system. If select is true, the tab is selected. |tab_index| gives the index
   // to insert the tab at. |selected_navigation| is the index of the
   // TabNavigation in |navigations| to select. If |extension_app_id| is
   // non-empty the tab is an app tab and |extension_app_id| is the id of the
@@ skipping 300 matching lines @@
   virtual void CloseFrameAfterDragSession();
   virtual void CreateHistoricalTab(TabContents* contents);
   virtual bool RunUnloadListenerBeforeClosing(TabContents* contents);
   virtual bool CanCloseContentsAt(int index);
   virtual bool CanBookmarkAllTabs() const;
   virtual void BookmarkAllTabs();
   virtual bool CanCloseTab() const;
   virtual void ToggleUseVerticalTabs();
   virtual bool CanRestoreTab();
   virtual void RestoreTab();
+  virtual bool LargeIconsPermitted() const;
 
   // Overridden from TabStripModelObserver:
   virtual void TabInsertedAt(TabContents* contents,
                              int index,
                              bool foreground);
   virtual void TabClosingAt(TabContents* contents, int index);
   virtual void TabDetachedAt(TabContents* contents, int index);
   virtual void TabDeselectedAt(TabContents* contents, int index);
   virtual void TabSelectedAt(TabContents* old_contents,
                              TabContents* new_contents,
@@ skipping 61 matching lines @@
                             bool show_history);
   virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
                                         bool* is_keyboard_shortcut);
   virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
   virtual void ShowRepostFormWarningDialog(TabContents* tab_contents);
   virtual void ShowContentSettingsWindow(ContentSettingsType content_type);
   virtual void ShowCollectedCookiesDialog(TabContents* tab_contents);
   virtual bool ShouldAddNavigationsToHistory() const;
   virtual void OnDidGetApplicationInfo(TabContents* tab_contents,
                                        int32 page_id);
-  virtual Browser* GetBrowser();
   virtual void ContentTypeChanged(TabContents* source);
   virtual void CommitMatchPreview(TabContents* source);
 
   // Overridden from SelectFileDialog::Listener:
   virtual void FileSelected(const FilePath& path, int index, void* params);
 
   // Overridden from NotificationObserver:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
@@ skipping 321 matching lines @@
   mutable BooleanPrefMember use_vertical_tabs_;
 
   // The profile's tab restore service. The service is owned by the profile,
   // and we install ourselves as an observer.
   TabRestoreService* tab_restore_service_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_H_