diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-17 23:39:53 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-17 23:39:53 +0000 |
| commit | 782338861ae38f3d0ec1ca6d07271e6177600142 (patch) | |
| tree | 0c9df0ff3a04a92a2caf622d32ffd4104958967e /ui/views | |
| parent | 0712fa9ddd89feadef0512460f70eedf85aaa019 (diff) | |
| download | chromium_src-782338861ae38f3d0ec1ca6d07271e6177600142.zip chromium_src-782338861ae38f3d0ec1ca6d07271e6177600142.tar.gz chromium_src-782338861ae38f3d0ec1ca6d07271e6177600142.tar.bz2 | |
fix double deletion of DesktopRootWindowHost on shutdown
BUG=146077
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10918280
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157240 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views')
| -rw-r--r-- | ui/views/widget/desktop_native_widget_aura.cc | 4 | ||||
| -rw-r--r-- | ui/views/widget/desktop_native_widget_aura.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ui/views/widget/desktop_native_widget_aura.cc b/ui/views/widget/desktop_native_widget_aura.cc index a19611f..2ef9649 100644 --- a/ui/views/widget/desktop_native_widget_aura.cc +++ b/ui/views/widget/desktop_native_widget_aura.cc @@ -34,8 +34,8 @@ void DesktopNativeWidgetAura::InitNativeWidget( window_->Init(params.layer_type); window_->Show(); - desktop_root_window_host_.reset( - DesktopRootWindowHost::Create(native_widget_delegate_, params.bounds)); + desktop_root_window_host_ = + DesktopRootWindowHost::Create(native_widget_delegate_, params.bounds); desktop_root_window_host_->Init(window_, params); } diff --git a/ui/views/widget/desktop_native_widget_aura.h b/ui/views/widget/desktop_native_widget_aura.h index e94bbda..b4182c4 100644 --- a/ui/views/widget/desktop_native_widget_aura.h +++ b/ui/views/widget/desktop_native_widget_aura.h @@ -136,7 +136,8 @@ class VIEWS_EXPORT DesktopNativeWidgetAura virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE; private: - scoped_ptr<DesktopRootWindowHost> desktop_root_window_host_; + // Ownership passed to RootWindow on Init. + DesktopRootWindowHost* desktop_root_window_host_; aura::Window* window_; Widget::InitParams::Ownership ownership_; internal::NativeWidgetDelegate* native_widget_delegate_; |