| Index: ash/aura/wm_window_aura.cc
|
| diff --git a/ash/aura/wm_window_aura.cc b/ash/aura/wm_window_aura.cc
|
| index 68ea03acac6d95fe48629e9f08b351ef67a34b5f..ab91a389453a67457dfa8c3001506a0e17fd984e 100644
|
| --- a/ash/aura/wm_window_aura.cc
|
| +++ b/ash/aura/wm_window_aura.cc
|
| @@ -26,6 +26,7 @@
|
| #include "ash/wm/window_util.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "ui/aura/client/aura_constants.h"
|
| +#include "ui/aura/client/focus_client.h"
|
| #include "ui/aura/client/window_tree_client.h"
|
| #include "ui/aura/layout_manager.h"
|
| #include "ui/aura/window.h"
|
| @@ -368,7 +369,7 @@ void WmWindowAura::AddChild(WmWindow* window) {
|
| window_->AddChild(GetAuraWindow(window));
|
| }
|
|
|
| -WmWindow* WmWindowAura::GetParent() {
|
| +const WmWindow* WmWindowAura::GetParent() const {
|
| return Get(window_->parent());
|
| }
|
|
|
| @@ -551,7 +552,11 @@ void WmWindowAura::SetRestoreOverrides(
|
| }
|
|
|
| void WmWindowAura::SetLockedToRoot(bool value) {
|
| - window_->SetProperty(kStayInSameRootWindowKey, value);
|
| + window_->SetProperty(kLockedToRootKey, value);
|
| +}
|
| +
|
| +bool WmWindowAura::IsLockedToRoot() const {
|
| + return window_->GetProperty(kLockedToRootKey);
|
| }
|
|
|
| void WmWindowAura::SetCapture() {
|
| @@ -627,6 +632,10 @@ void WmWindowAura::CloseWidget() {
|
| GetInternalWidget()->Close();
|
| }
|
|
|
| +void WmWindowAura::SetFocused() {
|
| + aura::client::GetFocusClient(window_)->FocusWindow(window_);
|
| +}
|
| +
|
| bool WmWindowAura::IsFocused() const {
|
| return window_->HasFocus();
|
| }
|
| @@ -720,10 +729,6 @@ void WmWindowAura::SetChildrenUseExtendedHitRegion() {
|
| window_, mouse_extend, touch_extend));
|
| }
|
|
|
| -void WmWindowAura::SetDescendantsStayInSameRootWindow(bool value) {
|
| - window_->SetProperty(kStayInSameRootWindowKey, true);
|
| -}
|
| -
|
| std::unique_ptr<views::View> WmWindowAura::CreateViewWithRecreatedLayers() {
|
| return base::MakeUnique<wm::WindowMirrorView>(this);
|
| }
|
|
|