summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-13 23:31:15 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-13 23:31:15 +0000
commit7015e76f31a4a882d11bbb8bcd664604489061dd (patch)
tree6f8131f5cdbace6f04578dba593a6305020a6bda
parente5567da6e56b7e750ecd45a17787daa1fe0a60fb (diff)
downloadchromium_src-7015e76f31a4a882d11bbb8bcd664604489061dd.zip
chromium_src-7015e76f31a4a882d11bbb8bcd664604489061dd.tar.gz
chromium_src-7015e76f31a4a882d11bbb8bcd664604489061dd.tar.bz2
Fixes bug where constrained windows in aura weren't calling through to
the delegate when destroyed, leading to crash. BUG=110168 TEST=see bug R=ben@chromium.org Review URL: http://codereview.chromium.org/9212013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117722 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/views/native_constrained_window_aura.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/native_constrained_window_aura.cc b/chrome/browser/ui/views/native_constrained_window_aura.cc
index 3106b03..4ea8ea5 100644
--- a/chrome/browser/ui/views/native_constrained_window_aura.cc
+++ b/chrome/browser/ui/views/native_constrained_window_aura.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -7,7 +7,7 @@
#include "ui/views/widget/native_widget_aura.h"
class NativeConstrainedWindowAura : public NativeConstrainedWindow,
- public views::NativeWidgetAura {
+ public views::NativeWidgetAura {
public:
explicit NativeConstrainedWindowAura(
NativeConstrainedWindowDelegate* delegate)
@@ -25,6 +25,10 @@ class NativeConstrainedWindowAura : public NativeConstrainedWindow,
}
// Overridden from views::NativeWidgetAura:
+ virtual void OnWindowDestroyed() OVERRIDE {
+ delegate_->OnNativeConstrainedWindowDestroyed();
+ views::NativeWidgetAura::OnWindowDestroyed();
+ }
NativeConstrainedWindowDelegate* delegate_;