diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-28 16:09:39 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-28 16:09:39 +0000 |
commit | 4a1665446b3c96006be66b7083511a2eadef6b5e (patch) | |
tree | c26f796a595058bb57f0818e003dece2494c1714 /chrome/browser/browser.h | |
parent | aeacd285cabfb269ba52fdbb1f60a6bf1e2d94d6 (diff) | |
download | chromium_src-4a1665446b3c96006be66b7083511a2eadef6b5e.zip chromium_src-4a1665446b3c96006be66b7083511a2eadef6b5e.tar.gz chromium_src-4a1665446b3c96006be66b7083511a2eadef6b5e.tar.bz2 |
Attempt 2 at Moving Browser::AddTypes to TabStripModel. The first
attempt caused some flakiness on the new tab warm startup test. The
only difference between this and the last is that I'm leaving some
suspcious code in TabStripModel::InsertTabContents and
Browser::AddTabWithURL. I'll try to isolate why those changes caused
flakiness after I land the rest.
Here's the description:
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.
. Converted InsertTabContents call in extensionstabmodule to pass in
nothing (Rafael said old code was wrong).
BUG=29933
TEST=none
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/2866024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50981 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.h')
-rw-r--r-- | chrome/browser/browser.h | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h index 6b7671a..e3add6e 100644 --- a/chrome/browser/browser.h +++ b/chrome/browser/browser.h @@ -104,22 +104,6 @@ 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 @@ -339,8 +323,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 AddTabTypes; see AddTabTypes for details. If |instance| - // is not null, its process will be used to render the tab. If + // 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. TabContents* AddTabWithURL(const GURL& url, const GURL& referrer, |