From da25dd5722963ed608ed1f96e2821f12226ab0c7 Mon Sep 17 00:00:00 2001 From: "sky@chromium.org" Date: Tue, 11 Jan 2011 19:06:30 +0000 Subject: 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 --- chrome/browser/ui/toolbar/wrench_menu_model.cc | 3 ++- chrome/browser/ui/toolbar/wrench_menu_model.h | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'chrome/browser/ui/toolbar') 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: -- cgit v1.1