diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 22:29:49 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-24 22:29:49 +0000 |
| commit | 9b7262502272c7ea9016b9ed21b0f828f75b5998 (patch) | |
| tree | a2166b44d42d3411111db26acad091b61f0d8032 /chrome/browser/browser.h | |
| parent | f7451d29b7efd0c08007a5f56414006cee20a3ef (diff) | |
| download | chromium_src-9b7262502272c7ea9016b9ed21b0f828f75b5998.zip chromium_src-9b7262502272c7ea9016b9ed21b0f828f75b5998.tar.gz chromium_src-9b7262502272c7ea9016b9ed21b0f828f75b5998.tar.bz2 | |
Revert 50752 - Moves Browser::AddTypes to TabStripModel. This patch is primarily
cleanup before I fix 29933, but has a couple of interesting bits
beyond the enum change:
. AddTabContents now supports adding pinned.
. Nuked duplicate code in Browser::addTabWithURL that invoked
wasHidden on the TabContents. This code is already in TabStripModel.
. Moved code for setting visibility of tabcontents from
TabStripModel::AddTabContents to InsertTabContentsAt. Since everything
ends up in InsertTabContentsAt it should be there.
. Converted InsertTabContents call in extensionstabmodule to pass in
nothing (Rafael said old code was wrong).
BUG=29933
TEST=none
Review URL: http://codereview.chromium.org/2863021
TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/2849025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50776 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.h')
| -rw-r--r-- | chrome/browser/browser.h | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h index e3add6e..6b7671a 100644 --- a/chrome/browser/browser.h +++ b/chrome/browser/browser.h @@ -104,6 +104,22 @@ class Browser : public TabStripModelDelegate, MAXIMIZED_STATE_UNMAXIMIZED }; + // Constants passed to AddTabWithURL. + enum AddTabTypes { + // Used to indicate nothing special should happen to the newly inserted + // tab. + ADD_NONE = 0, + + // The tab should be selected. + ADD_SELECTED = 1 << 0, + + // The tab should be pinned. + ADD_PINNED = 1 << 1, + + // See TabStripModel::AddTabContents for details. + ADD_FORCE_INDEX = 1 << 2, + }; + // Constructors, Creation, Showing ////////////////////////////////////////// // Creates a new browser of the given |type| and for the given |profile|. The @@ -323,8 +339,8 @@ class Browser : public TabStripModelDelegate, 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 + // values defined by AddTabTypes; see AddTabTypes 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. TabContents* AddTabWithURL(const GURL& url, const GURL& referrer, |