summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tabs
diff options
context:
space:
mode:
authorbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-12 04:09:26 +0000
committerbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-12 04:09:26 +0000
commitbd9b55430689403d9b17fcfe633266c8ad650df4 (patch)
treec476a916a3540d818cb4590f77d5be1d992828f3 /chrome/browser/tabs
parent787305982c59681c22b8be21c10073143529bf74 (diff)
downloadchromium_src-bd9b55430689403d9b17fcfe633266c8ad650df4.zip
chromium_src-bd9b55430689403d9b17fcfe633266c8ad650df4.tar.gz
chromium_src-bd9b55430689403d9b17fcfe633266c8ad650df4.tar.bz2
Fiddle with destruction order of the dragged tab controller to ensure that there's still a TabStrip available for it.
B=1145714 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@708 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tabs')
-rw-r--r--chrome/browser/tabs/tab_strip.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/tabs/tab_strip.cc b/chrome/browser/tabs/tab_strip.cc
index 2354f5e..f4b1447 100644
--- a/chrome/browser/tabs/tab_strip.cc
+++ b/chrome/browser/tabs/tab_strip.cc
@@ -467,6 +467,9 @@ TabStrip::~TabStrip() {
// TODO(beng): (1031854) Restore this line once XPFrame/VistaFrame are dead.
//model_->RemoveObserver(this);
+ // TODO(beng): remove this if it doesn't work to fix the TabSelectedAt bug.
+ drag_controller_.reset(NULL);
+
// Stop any existing Loading Animation timer.
MessageLoop::current()->timer_manager()->StopTimer(
loading_animation_timer_.get());