| Index: chrome/browser/browser.h
|
| ===================================================================
|
| --- chrome/browser/browser.h (revision 55729)
|
| +++ chrome/browser/browser.h (working copy)
|
| @@ -227,20 +227,29 @@
|
| // 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);
|
| @@ -333,13 +342,17 @@
|
| // 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.
|
| @@ -660,6 +673,7 @@
|
| virtual void ToggleUseVerticalTabs();
|
| virtual bool CanRestoreTab();
|
| virtual void RestoreTab();
|
| + virtual bool LargeIconsPermitted() const;
|
|
|
| // Overridden from TabStripModelObserver:
|
| virtual void TabInsertedAt(TabContents* contents,
|
| @@ -741,7 +755,6 @@
|
| 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);
|
|
|
|
|