diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-01 00:23:44 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-01 00:23:44 +0000 |
| commit | d59fb48ad4e9194358b27ed1f2c91458aeafcff9 (patch) | |
| tree | f7554aceda1572edabc3bddaf181eb252d00bff6 /chrome/browser | |
| parent | 40d41b949d3a0b4238f6c01bd165c648375d979e (diff) | |
| download | chromium_src-d59fb48ad4e9194358b27ed1f2c91458aeafcff9.zip chromium_src-d59fb48ad4e9194358b27ed1f2c91458aeafcff9.tar.gz chromium_src-d59fb48ad4e9194358b27ed1f2c91458aeafcff9.tar.bz2 | |
Second attempt at fixing dist crash... more accurately control the lifetime of the dragged tab container.
http://crbug.com/3939
Review URL: http://codereview.chromium.org/8800
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/views/tabs/dragged_tab_view.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/views/tabs/dragged_tab_view.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/views/tabs/dragged_tab_view.cc b/chrome/browser/views/tabs/dragged_tab_view.cc index 54a8193..48750d713 100644 --- a/chrome/browser/views/tabs/dragged_tab_view.cc +++ b/chrome/browser/views/tabs/dragged_tab_view.cc @@ -38,7 +38,7 @@ DraggedTabView::DraggedTabView(TabContents* datasource, renderer_->UpdateData(datasource); - container_ = new views::ContainerWin; + container_.reset(new views::ContainerWin); container_->set_window_style(WS_POPUP); container_->set_window_ex_style( WS_EX_LAYERED | WS_EX_TOPMOST | WS_EX_TOOLWINDOW); @@ -51,7 +51,7 @@ DraggedTabView::~DraggedTabView() { if (close_animation_.IsAnimating()) close_animation_.Stop(); GetParent()->RemoveChildView(this); - container_->Close(); + container_->CloseNow(); } void DraggedTabView::MoveTo(const gfx::Point& screen_point) { diff --git a/chrome/browser/views/tabs/dragged_tab_view.h b/chrome/browser/views/tabs/dragged_tab_view.h index 6076acc..be809f4 100644 --- a/chrome/browser/views/tabs/dragged_tab_view.h +++ b/chrome/browser/views/tabs/dragged_tab_view.h @@ -76,7 +76,7 @@ class DraggedTabView : public views::View, int ScaleValue(int value); // The window that contains the DraggedTabView. - views::ContainerWin* container_; + scoped_ptr<views::ContainerWin> container_; // The renderer that paints the Tab shape. scoped_ptr<TabRenderer> renderer_; |