| OLD | NEW |
| 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/wm/core/window_util.h" | 5 #include "ui/wm/core/window_util.h" |
| 6 | 6 |
| 7 #include "ui/aura/client/activation_client.h" | 7 #include "ui/aura/client/activation_client.h" |
| 8 #include "ui/aura/window.h" | 8 #include "ui/aura/window.h" |
| 9 #include "ui/aura/window_event_dispatcher.h" | 9 #include "ui/aura/window_event_dispatcher.h" |
| 10 #include "ui/compositor/layer.h" | 10 #include "ui/compositor/layer.h" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 parent->Add(clone); | 28 parent->Add(clone); |
| 29 // RecreateLayer() moves the existing children to the new layer. Create a | 29 // RecreateLayer() moves the existing children to the new layer. Create a |
| 30 // copy of those. | 30 // copy of those. |
| 31 CloneChildren(owner->layer(), clone); | 31 CloneChildren(owner->layer(), clone); |
| 32 } | 32 } |
| 33 } | 33 } |
| 34 } | 34 } |
| 35 | 35 |
| 36 } // namespace | 36 } // namespace |
| 37 | 37 |
| 38 namespace views { | 38 namespace wm { |
| 39 namespace corewm { | |
| 40 | 39 |
| 41 void ActivateWindow(aura::Window* window) { | 40 void ActivateWindow(aura::Window* window) { |
| 42 DCHECK(window); | 41 DCHECK(window); |
| 43 DCHECK(window->GetRootWindow()); | 42 DCHECK(window->GetRootWindow()); |
| 44 aura::client::GetActivationClient(window->GetRootWindow())->ActivateWindow( | 43 aura::client::GetActivationClient(window->GetRootWindow())->ActivateWindow( |
| 45 window); | 44 window); |
| 46 } | 45 } |
| 47 | 46 |
| 48 void DeactivateWindow(aura::Window* window) { | 47 void DeactivateWindow(aura::Window* window) { |
| 49 DCHECK(window); | 48 DCHECK(window); |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 | 119 |
| 121 bool HasTransientAncestor(const aura::Window* window, | 120 bool HasTransientAncestor(const aura::Window* window, |
| 122 const aura::Window* ancestor) { | 121 const aura::Window* ancestor) { |
| 123 const aura::Window* transient_parent = GetTransientParent(window); | 122 const aura::Window* transient_parent = GetTransientParent(window); |
| 124 if (transient_parent == ancestor) | 123 if (transient_parent == ancestor) |
| 125 return true; | 124 return true; |
| 126 return transient_parent ? | 125 return transient_parent ? |
| 127 HasTransientAncestor(transient_parent, ancestor) : false; | 126 HasTransientAncestor(transient_parent, ancestor) : false; |
| 128 } | 127 } |
| 129 | 128 |
| 130 } // namespace corewm | 129 } // namespace wm |
| 131 } // namespace views | |
| OLD | NEW |