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

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

Issue 8574016: aura: Do not attempt to remove the window multiple times on detach. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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
« no previous file with comments | « no previous file | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "views/controls/native/native_view_host_aura.h" 5 #include "views/controls/native/native_view_host_aura.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ui/aura/focus_manager.h" 8 #include "ui/aura/focus_manager.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "views/controls/native/native_view_host.h" 10 #include "views/controls/native/native_view_host.h"
(...skipping 17 matching lines...) Expand all
28 host_->GetWidget()->GetNativeView()->AddChild(host_->native_view()); 28 host_->GetWidget()->GetNativeView()->AddChild(host_->native_view());
29 host_->Layout(); 29 host_->Layout();
30 30
31 host_->native_view()->AddObserver(this); 31 host_->native_view()->AddObserver(this);
32 } 32 }
33 33
34 void NativeViewHostAura::NativeViewDetaching(bool destroyed) { 34 void NativeViewHostAura::NativeViewDetaching(bool destroyed) {
35 if (!destroyed) { 35 if (!destroyed) {
36 host_->native_view()->RemoveObserver(this); 36 host_->native_view()->RemoveObserver(this);
37 host_->native_view()->Hide(); 37 host_->native_view()->Hide();
38 host_->GetWidget()->GetNativeView()->RemoveChild(host_->native_view());
39 } 38 }
40 } 39 }
41 40
42 void NativeViewHostAura::AddedToWidget() { 41 void NativeViewHostAura::AddedToWidget() {
43 if (!host_->native_view()) 42 if (!host_->native_view())
44 return; 43 return;
45 44
46 aura::Window* widget_window = host_->GetWidget()->GetNativeView(); 45 aura::Window* widget_window = host_->GetWidget()->GetNativeView();
47 if (host_->native_view()->parent() != widget_window) 46 if (host_->native_view()->parent() != widget_window)
48 widget_window->AddChild(host_->native_view()); 47 widget_window->AddChild(host_->native_view());
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 host_->NativeViewDestroyed(); 94 host_->NativeViewDestroyed();
96 } 95 }
97 96
98 // static 97 // static
99 NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper( 98 NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper(
100 NativeViewHost* host) { 99 NativeViewHost* host) {
101 return new NativeViewHostAura(host); 100 return new NativeViewHostAura(host);
102 } 101 }
103 102
104 } // namespace views 103 } // namespace views
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698