Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(394)

Side by Side Diff: ui/views/controls/native/native_view_host_aura.cc

Issue 101013002: Make sure WindowObservers are removed from window before destruction (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cc Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« ui/aura/window_observer.h ('K') | « ui/aura/window_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/controls/native/native_view_host_aura.h" 5 #include "ui/views/controls/native/native_view_host_aura.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ui/aura/client/focus_client.h" 8 #include "ui/aura/client/focus_client.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/views/controls/native/native_view_host.h" 10 #include "ui/views/controls/native/native_view_host.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 client->FocusWindow(window); 96 client->FocusWindow(window);
97 } 97 }
98 98
99 gfx::NativeViewAccessible NativeViewHostAura::GetNativeViewAccessible() { 99 gfx::NativeViewAccessible NativeViewHostAura::GetNativeViewAccessible() {
100 return NULL; 100 return NULL;
101 } 101 }
102 102
103 void NativeViewHostAura::OnWindowDestroyed(aura::Window* window) { 103 void NativeViewHostAura::OnWindowDestroyed(aura::Window* window) {
104 DCHECK(window == host_->native_view()); 104 DCHECK(window == host_->native_view());
105 host_->NativeViewDestroyed(); 105 host_->NativeViewDestroyed();
106 aura::WindowObserver::OnWindowDestroyed(window);
106 } 107 }
107 108
108 // static 109 // static
109 NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper( 110 NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper(
110 NativeViewHost* host) { 111 NativeViewHost* host) {
111 return new NativeViewHostAura(host); 112 return new NativeViewHostAura(host);
112 } 113 }
113 114
114 } // namespace views 115 } // namespace views
OLDNEW
« ui/aura/window_observer.h ('K') | « ui/aura/window_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698