diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-11 19:06:30 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-11 19:06:30 +0000 |
| commit | da25dd5722963ed608ed1f96e2821f12226ab0c7 (patch) | |
| tree | 679b2fd1c70d9979e6a059043fbc96d432ddd7c8 /chrome/browser/ui/toolbar | |
| parent | c59a3056e4847224a141467682f59b6230a7399a (diff) | |
| download | chromium_src-da25dd5722963ed608ed1f96e2821f12226ab0c7.zip chromium_src-da25dd5722963ed608ed1f96e2821f12226ab0c7.tar.gz chromium_src-da25dd5722963ed608ed1f96e2821f12226ab0c7.tar.bz2 | |
Changes instant so that the newly created tab has a new id. Doing
otherwise causes subtle problems with extensions and breaks the
invariant that the tab id is unique.
BUG=68508
TEST=none
Review URL: http://codereview.chromium.org/6155003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71063 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/toolbar')
| -rw-r--r-- | chrome/browser/ui/toolbar/wrench_menu_model.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/toolbar/wrench_menu_model.h | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc index e45db37..7a9a9ba 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc @@ -334,7 +334,8 @@ void WrenchMenuModel::TabSelectedAt(TabContentsWrapper* old_contents, UpdateZoomControls(); } -void WrenchMenuModel::TabReplacedAt(TabContentsWrapper* old_contents, +void WrenchMenuModel::TabReplacedAt(TabStripModel* tab_strip_model, + TabContentsWrapper* old_contents, TabContentsWrapper* new_contents, int index) { UpdateZoomControls(); diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.h b/chrome/browser/ui/toolbar/wrench_menu_model.h index 2690ea9..5ebf7ee 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.h +++ b/chrome/browser/ui/toolbar/wrench_menu_model.h @@ -98,8 +98,10 @@ class WrenchMenuModel : public menus::SimpleMenuModel, TabContentsWrapper* new_contents, int index, bool user_gesture); - virtual void TabReplacedAt(TabContentsWrapper* old_contents, - TabContentsWrapper* new_contents, int index); + virtual void TabReplacedAt(TabStripModel* tab_strip_model, + TabContentsWrapper* old_contents, + TabContentsWrapper* new_contents, + int index); virtual void TabStripModelDeleted(); // Overridden from NotificationObserver: |