Wires up WmWindowMus::SetBoundsInScreen()

ash/mus/bridge/wm_window_mus.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/mus/bridge/wm_window_mus.h"
 
 #include "ash/common/wm/container_finder.h"
+#include "ash/common/wm/window_positioning_utils.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/mus/bridge/mus_layout_manager_adapter.h"
 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
 #include "ash/mus/bridge/wm_shell_mus.h"
 #include "ash/mus/property_util.h"
 #include "services/ui/public/cpp/property_type_converters.h"
@@ skipping 89 matching lines @@
   window_->AddObserver(this);
   window_->SetLocalProperty(kWmWindowKey, this);
   window_state_.reset(new WindowStateMus(this));
 }
 
 WmWindowMus::~WmWindowMus() {
   window_->RemoveObserver(this);
 }
 
 // static
-WmWindowMus* WmWindowMus::Get(ui::Window* window) {
+const WmWindowMus* WmWindowMus::Get(const ui::Window* window) {
   if (!window)
     return nullptr;
 
-  WmWindowMus* wm_window = window->GetLocalProperty(kWmWindowKey);
+  const WmWindowMus* wm_window = window->GetLocalProperty(kWmWindowKey);
   if (wm_window)
     return wm_window;
   // WmWindowMus is owned by the ui::Window.
-  return new WmWindowMus(window);
+  // Unfortunately there isn't a good way to avoid the cast here.
+  return new WmWindowMus(const_cast<ui::Window*>(window));
 }
 
 // static
 WmWindowMus* WmWindowMus::Get(views::Widget* widget) {
   return WmWindowMus::Get(aura::GetMusWindow(widget->GetNativeView()));
 }
 
 // static
 const ui::Window* WmWindowMus::GetMusWindow(const WmWindow* wm_window) {
   return static_cast<const WmWindowMus*>(wm_window)->mus_window();
@@ skipping 299 matching lines @@
 
 void WmWindowMus::SetParentUsingContext(WmWindow* context,
                                         const gfx::Rect& screen_bounds) {
   wm::GetDefaultParent(context, this, screen_bounds)->AddChild(this);
 }
 
 void WmWindowMus::AddChild(WmWindow* window) {
   window_->AddChild(GetMusWindow(window));
 }
 
-WmWindow* WmWindowMus::GetParent() {
+const WmWindow* WmWindowMus::GetParent() const {
   return Get(window_->parent());
 }
 
 const WmWindow* WmWindowMus::GetTransientParent() const {
   return Get(window_->transient_parent());
 }
 
 std::vector<WmWindow*> WmWindowMus::GetTransientChildren() {
   return FromMusWindows(window_->transient_children());
 }
@@ skipping 86 matching lines @@
 }
 
 void WmWindowMus::SetBoundsDirectCrossFade(const gfx::Rect& bounds) {
   // TODO: need animation support: http://crbug.com/615087.
   NOTIMPLEMENTED();
   SetBoundsDirect(bounds);
 }
 
 void WmWindowMus::SetBoundsInScreen(const gfx::Rect& bounds_in_screen,
                                     const display::Display& dst_display) {
-  // TODO: SetBoundsInScreen isn't fully implemented yet,
-  // http://crbug.com/615552.
-  NOTIMPLEMENTED();
-  SetBounds(ConvertRectFromScreen(bounds_in_screen));
+  DCHECK(GetParent());  // Aura code assumed a client, so this does too.

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

"a client"?  A child?

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

parent actually. Updated.

+  if (static_cast<const WmWindowMus*>(GetParent())

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

Any particular reason this casts to const? (My aging eyes mistook it for a
const_cast at first.)

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

Actually, yes. WmWindow has the inline implementation of the non-const version
(as suggested in effective c++):
  WmWindow* GetParent() {
    return const_cast<WmWindow*>(
        const_cast<const WmWindow*>(this)->GetParent());
  }

and the const version if pure virtual:
  virtual const WmWindow* GetParent() const = 0;

A ramification of this is that in a subclass (WmWindowMus or WmWindowAura) when
you call GetParent() it's resolved to the const version as that is what the
class declares. So, if I don't do the static_cast to const here I get:

../../ash/mus/bridge/wm_window_mus.cc:555:7: error: static_cast from 'const
ash::WmWindow *' to 'ash::mus::WmWindowMus *' casts away qualifiers
  if (static_cast<WmWindowMus*>(GetParent())

+          ->child_bounds_in_screen_behavior_ ==
+      BoundsInScreenBehavior::USE_LOCAL_COORDINATES) {
+    SetBounds(bounds_in_screen);
+    return;
+  }
+  wm::SetBoundsInScreen(this, bounds_in_screen, dst_display);
 }
 
 gfx::Rect WmWindowMus::GetBoundsInScreen() const {
   return ConvertRectToScreen(gfx::Rect(window_->bounds().size()));
 }
 
 const gfx::Rect& WmWindowMus::GetBounds() const {
   return window_->bounds();
 }
 
@@ skipping 35 matching lines @@
 }
 
 void WmWindowMus::SetRestoreOverrides(
     const gfx::Rect& bounds_override,
     ui::WindowShowState window_state_override) {
   // TODO(sky): see http://crbug.com/623314.
   NOTIMPLEMENTED();
 }
 
 void WmWindowMus::SetLockedToRoot(bool value) {
-  // TODO(sky): there is no getter for this. Investigate where used.
-  NOTIMPLEMENTED();
+  locked_to_root_ = value;
+}
+
+bool WmWindowMus::IsLockedToRoot() const {
+  return locked_to_root_;
 }
 
 void WmWindowMus::SetCapture() {
   window_->SetCapture();
 }
 
 bool WmWindowMus::HasCapture() {
   return window_->HasCapture();
 }
 
@@ skipping 71 matching lines @@
 
 void WmWindowMus::CloseWidget() {
   DCHECK(widget_);
   // Allow the client to service the close request for remote widgets.
   if (widget_creation_type_ == WidgetCreationType::FOR_CLIENT)
     window_->RequestClose();
   else
     widget_->Close();
 }
 
+void WmWindowMus::SetFocused() {
+  window_->SetFocus();
+}
+
 bool WmWindowMus::IsFocused() const {
   return window_->HasFocus();
 }
 
 bool WmWindowMus::IsActive() const {
   ui::Window* focused = window_->window_tree()->GetFocusedWindow();
   return focused && window_->Contains(focused);
 }
 
 void WmWindowMus::Activate() {
@@ skipping 59 matching lines @@
 
 void WmWindowMus::InstallResizeHandleWindowTargeter(
     ImmersiveFullscreenController* immersive_fullscreen_controller) {
   // TODO(sky): I believe once ImmersiveFullscreenController is ported this
   // won't be necessary in mash, but I need to verify that:
   // http://crbug.com/548435.
 }
 
 void WmWindowMus::SetBoundsInScreenBehaviorForChildren(
     WmWindow::BoundsInScreenBehavior behavior) {
-  // TODO: SetBoundsInScreen isn't fully implemented yet,
-  // http://crbug.com/615552.
-  NOTIMPLEMENTED();
+  child_bounds_in_screen_behavior_ = behavior;
 }
 
 void WmWindowMus::SetSnapsChildrenToPhysicalPixelBoundary() {
   if (snap_children_to_pixel_boundary_)
     return;
 
   snap_children_to_pixel_boundary_ = true;
   FOR_EACH_OBSERVER(
       WmWindowObserver, observers_,
       OnWindowPropertyChanged(
           this, WmWindowProperty::SNAP_CHILDREN_TO_PIXEL_BOUNDARY));
 }
 
 void WmWindowMus::SnapToPixelBoundaryIfNecessary() {
   WmWindowMus* parent = Get(window_->parent());
   if (parent && parent->snap_children_to_pixel_boundary_) {
     // TODO: implement snap to pixel: http://crbug.com/615554.
     NOTIMPLEMENTED();
   }
 }
 
 void WmWindowMus::SetChildrenUseExtendedHitRegion() {
   children_use_extended_hit_region_ = true;
 }
 
-void WmWindowMus::SetDescendantsStayInSameRootWindow(bool value) {
-  // TODO: this logic feeds into SetBoundsInScreen(), which is not implemented:
-  // http://crbug.com/615552.
-  NOTIMPLEMENTED();
-}
-
 std::unique_ptr<views::View> WmWindowMus::CreateViewWithRecreatedLayers() {
   // TODO: need real implementation, http://crbug.com/629497.
   std::unique_ptr<views::View> view(new views::View);
   return view;
 }
 
 void WmWindowMus::AddObserver(WmWindowObserver* observer) {
   observers_.AddObserver(observer);
 }
 
@@ skipping 91 matching lines @@
 }
 
 void WmWindowMus::OnTransientChildRemoved(ui::Window* window,
                                           ui::Window* transient) {
   FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_,
                     OnTransientChildRemoved(this, Get(transient)));
 }
 
 }  // namespace mus
 }  // namespace ash