diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-03 23:12:23 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-03 23:12:23 +0000 |
| commit | addcc2f6d0e9fd7e9401911c4bae14819a32af68 (patch) | |
| tree | feee7b88b7c62669ff297dc31ab46ef894603d1a /chrome/browser/views | |
| parent | 67c78e7c7104c7c0eb133fc8a057c53d0ed75abb (diff) | |
| download | chromium_src-addcc2f6d0e9fd7e9401911c4bae14819a32af68.zip chromium_src-addcc2f6d0e9fd7e9401911c4bae14819a32af68.tar.gz chromium_src-addcc2f6d0e9fd7e9401911c4bae14819a32af68.tar.bz2 | |
Revert some of my earlier change to see if this fixes dist tests, and revert my earlier experiment.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4509 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
| -rw-r--r-- | chrome/browser/views/frame/browser_view2.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/views/tabs/dragged_tab_controller.cc | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/views/frame/browser_view2.cc b/chrome/browser/views/frame/browser_view2.cc index dcc9769..477a910 100644 --- a/chrome/browser/views/frame/browser_view2.cc +++ b/chrome/browser/views/frame/browser_view2.cc @@ -116,7 +116,8 @@ BrowserView2::~BrowserView2() { void BrowserView2::WindowMoved() { // Cancel any tabstrip animations, some of them may be invalidated by the // window being repositioned. - tabstrip_->DestroyDragController(); + // Comment out for one cycle to see if this fixes dist tests. + //tabstrip_->DestroyDragController(); status_bubble_->Reposition(); diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc index b79759f..4da9dba 100644 --- a/chrome/browser/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/views/tabs/dragged_tab_controller.cc @@ -107,8 +107,7 @@ DraggedTabController::~DraggedTabController() { // contents to NULL, otherwise if the view is animating to its destination // bounds, it won't be able to clean up properly since its cleanup routine // uses GetIndexForDraggedContents, which will be invalid. - //Commenting out for one cycle to see if this fixes dist tests. - //view_.reset(NULL); + view_.reset(NULL); ChangeDraggedContents(NULL); // This removes our observer. } |