summaryrefslogtreecommitdiffstats
path: root/chrome/views
diff options
context:
space:
mode:
authorbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-24 22:10:49 +0000
committerbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-24 22:10:49 +0000
commit4fb105e615d1ee15127f8b293e7e3361ed7c74b0 (patch)
treee32164fddca640e3972347909f1942f5b714374c /chrome/views
parent92673f391bfc070e0495bce0fca4769665e7b50e (diff)
downloadchromium_src-4fb105e615d1ee15127f8b293e7e3361ed7c74b0.zip
chromium_src-4fb105e615d1ee15127f8b293e7e3361ed7c74b0.tar.gz
chromium_src-4fb105e615d1ee15127f8b293e7e3361ed7c74b0.tar.bz2
roll back r1297 for now
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1298 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views')
-rw-r--r--chrome/views/window.cc1
-rw-r--r--chrome/views/window_delegate.cc1
2 files changed, 1 insertions, 1 deletions
diff --git a/chrome/views/window.cc b/chrome/views/window.cc
index 75bd988..db6174c 100644
--- a/chrome/views/window.cc
+++ b/chrome/views/window.cc
@@ -336,7 +336,6 @@ void Window::OnCommand(UINT notification_code, int command_id, HWND window) {
void Window::OnDestroy() {
if (window_delegate_) {
window_delegate_->WindowClosing();
- window_delegate_->window_.release();
window_delegate_ = NULL;
}
RestoreEnabledIfNecessary();
diff --git a/chrome/views/window_delegate.cc b/chrome/views/window_delegate.cc
index d93a7bd..f6021e0 100644
--- a/chrome/views/window_delegate.cc
+++ b/chrome/views/window_delegate.cc
@@ -14,6 +14,7 @@ WindowDelegate::WindowDelegate() {
}
WindowDelegate::~WindowDelegate() {
+ window_.release();
}
// Returns the icon to be displayed in the window.