Wires up WmWindowMus::SetBoundsInScreen()

ash/aura/wm_window_aura.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/aura/wm_window_aura.h"
 
 #include "ash/aura/aura_layout_manager_adapter.h"
 #include "ash/aura/wm_root_window_controller_aura.h"
 #include "ash/aura/wm_shell_aura.h"
 #include "ash/common/ash_constants.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_layout_manager.h"
 #include "ash/common/wm_transient_window_observer.h"
 #include "ash/common/wm_window_observer.h"
 #include "ash/common/wm_window_property.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/wm/resize_handle_window_targeter.h"
 #include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_mirror_view.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state_aura.h"
 #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"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_property.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/layer_tree_owner.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/insets.h"
@@ skipping 322 matching lines @@
 void WmWindowAura::SetParentUsingContext(WmWindow* context,
                                          const gfx::Rect& screen_bounds) {
   aura::client::ParentWindowWithContext(window_, GetAuraWindow(context),
                                         screen_bounds);
 }
 
 void WmWindowAura::AddChild(WmWindow* window) {
   window_->AddChild(GetAuraWindow(window));
 }
 
-WmWindow* WmWindowAura::GetParent() {
+const WmWindow* WmWindowAura::GetParent() const {
   return Get(window_->parent());
 }
 
 const WmWindow* WmWindowAura::GetTransientParent() const {
   return Get(::wm::GetTransientParent(window_));
 }
 
 std::vector<WmWindow*> WmWindowAura::GetTransientChildren() {
   return FromAuraWindows(::wm::GetTransientChildren(window_));
 }
@@ skipping 165 matching lines @@
   }
   window_->SetProperty(kRestoreShowStateOverrideKey, window_state_override);
   window_->SetProperty(kRestoreBoundsOverrideKey,
                        new gfx::Rect(bounds_override));
 }
 
 void WmWindowAura::SetLockedToRoot(bool value) {
   window_->SetProperty(kStayInSameRootWindowKey, value);
 }
 
+bool WmWindowAura::IsLockedToRoot() const {
+  return window_->GetProperty(kStayInSameRootWindowKey);

[James Cook, 2016/09/15 16:31:40]

It's a little weird that many of the functions are now called LockedToRoot, but
the window property is still StayInSameRootWindow and some of the utility
functions reference StayInSameRootWindow. Can you change things to be consistent
everywhere?

[sky, 2016/09/15 17:35:03]

I went with LockedToRoot everywhere.

+}
+
 void WmWindowAura::SetCapture() {
   window_->SetCapture();
 }
 
 bool WmWindowAura::HasCapture() {
   return window_->HasCapture();
 }
 
 void WmWindowAura::ReleaseCapture() {
   window_->ReleaseCapture();
@@ skipping 53 matching lines @@
 
 views::Widget* WmWindowAura::GetInternalWidget() {
   return views::Widget::GetWidgetForNativeView(window_);
 }
 
 void WmWindowAura::CloseWidget() {
   DCHECK(GetInternalWidget());
   GetInternalWidget()->Close();
 }
 
+void WmWindowAura::SetFocused() {
+  aura::client::GetFocusClient(window_)->FocusWindow(window_);
+}
+
 bool WmWindowAura::IsFocused() const {
   return window_->HasFocus();
 }
 
 bool WmWindowAura::IsActive() const {
   return wm::IsActiveWindow(window_);
 }
 
 void WmWindowAura::Activate() {
   wm::ActivateWindow(window_);
@@ skipping 73 matching lines @@
 void WmWindowAura::SetChildrenUseExtendedHitRegion() {
   gfx::Insets mouse_extend(-kResizeOutsideBoundsSize, -kResizeOutsideBoundsSize,
                            -kResizeOutsideBoundsSize,
                            -kResizeOutsideBoundsSize);
   gfx::Insets touch_extend =
       mouse_extend.Scale(kResizeOutsideBoundsScaleForTouch);
   window_->SetEventTargeter(base::MakeUnique<::wm::EasyResizeWindowTargeter>(
       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);
 }
 
 void WmWindowAura::AddObserver(WmWindowObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void WmWindowAura::RemoveObserver(WmWindowObserver* observer) {
   observers_.RemoveObserver(observer);
@@ skipping 122 matching lines @@
                     OnTransientChildAdded(this, Get(transient)));
 }
 
 void WmWindowAura::OnTransientChildRemoved(aura::Window* window,
                                            aura::Window* transient) {
   FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_,
                     OnTransientChildRemoved(this, Get(transient)));
 }
 
 }  // namespace ash