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/gtk/tabs/tab_strip_gtk.cc | 3 ++- chrome/browser/gtk/tabs/tab_strip_gtk.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'chrome/browser/gtk') diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc index 8cadca9..233ad58 100644 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc @@ -1061,7 +1061,8 @@ void TabStripGtk::TabChangedAt(TabContentsWrapper* contents, int index, tab->UpdateFromModel(); } -void TabStripGtk::TabReplacedAt(TabContentsWrapper* old_contents, +void TabStripGtk::TabReplacedAt(TabStripModel* tab_strip_model, + TabContentsWrapper* old_contents, TabContentsWrapper* new_contents, int index) { TabChangedAt(new_contents, index, ALL); diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.h b/chrome/browser/gtk/tabs/tab_strip_gtk.h index 20d9ee0..716a793 100644 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.h +++ b/chrome/browser/gtk/tabs/tab_strip_gtk.h @@ -115,7 +115,8 @@ class TabStripGtk : public TabStripModelObserver, int to_index); virtual void TabChangedAt(TabContentsWrapper* contents, int index, TabChangeType change_type); - virtual void TabReplacedAt(TabContentsWrapper* old_contents, + virtual void TabReplacedAt(TabStripModel* tab_strip_model, + TabContentsWrapper* old_contents, TabContentsWrapper* new_contents, int index); virtual void TabMiniStateChanged(TabContentsWrapper* contents, int index); -- cgit v1.1