PlatformWindowMus::SetBounds to NativeWidgetMus

ui/views/mus/native_widget_mus.cc

 // Copyright 2015 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 "ui/views/mus/native_widget_mus.h"
 
 #include "base/macros.h"
 #include "base/thread_task_runner_handle.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
@@ skipping 280 matching lines @@
     return SkBitmap();
   return app_icon.GetRepresentation(1.f).sk_bitmap();
 }
 
 }  // namespace
 
 class NativeWidgetMus::MusWindowObserver : public mus::WindowObserver {
  public:
   explicit MusWindowObserver(NativeWidgetMus* native_widget_mus)
       : native_widget_mus_(native_widget_mus) {
-    native_widget_mus_->window_->AddObserver(this);
+    mus_window()->AddObserver(this);
   }
 
   ~MusWindowObserver() override {
-    native_widget_mus_->window_->RemoveObserver(this);
+    mus_window()->RemoveObserver(this);
   }
 
   // mus::WindowObserver:
   void OnWindowVisibilityChanging(mus::Window* window) override {
     native_widget_mus_->OnMusWindowVisibilityChanging(window);
   }
   void OnWindowVisibilityChanged(mus::Window* window) override {
     native_widget_mus_->OnMusWindowVisibilityChanged(window);
   }
+  void OnWindowBoundsChanged(mus::Window* window,
+                             const gfx::Rect& old_bounds,
+                             const gfx::Rect& new_bounds) override {
+    window_tree_host()->OnBoundsChanged(new_bounds);
+  }
 
  private:
+  mus::Window* mus_window() { return native_widget_mus_->window(); }
+  WindowTreeHostMus* window_tree_host() {

[sadrul, 2016/05/09 20:19:46]

Change this to aura::WindowTreeHost*. That should take care of the build issues
on the bots.

[Mark Dittmer, 2016/05/10 13:26:03]

I believe OnBoundsChanged is part of the PlatformWindowDelegate, implemented by
WindowTreeHostPlatform. Right now I'm testing out a cast to
PlatformWindowDelegate.

+    return native_widget_mus_->window_tree_host();
+  }
+
   NativeWidgetMus* native_widget_mus_;
 
   DISALLOW_COPY_AND_ASSIGN(MusWindowObserver);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetMus, public:
 
 NativeWidgetMus::NativeWidgetMus(internal::NativeWidgetDelegate* delegate,
                                  shell::Connector* connector,
@@ skipping 388 matching lines @@
       return window_->GetSharedProperty<gfx::Rect>(kRestoreBounds_Property);
   }
   return GetWindowBoundsInScreen();
 }
 
 std::string NativeWidgetMus::GetWorkspace() const {
   return std::string();
 }
 
 void NativeWidgetMus::SetBounds(const gfx::Rect& bounds) {
-  if (!window_tree_host_)
+  if (!(window_ && window_tree_host_))
     return;
 
   gfx::Size size(bounds.size());
   const gfx::Size min_size = GetMinimumSize();
   const gfx::Size max_size = GetMaximumSize();
   if (!max_size.IsEmpty())
     size.SetToMin(max_size);
   size.SetToMax(min_size);
   window_tree_host_->SetBounds(gfx::Rect(bounds.origin(), size));
+  window_->SetBounds(gfx::Rect(bounds.origin(), size));
 }
 
 void NativeWidgetMus::SetSize(const gfx::Size& size) {
   if (!window_tree_host_)
     return;
 
   gfx::Rect bounds = window_tree_host_->GetBounds();
   SetBounds(gfx::Rect(bounds.origin(), size));
 }
 
@@ skipping 389 matching lines @@
     window_tree_host_->Show();
     GetNativeWindow()->Show();
   } else {
     window_tree_host_->Hide();
     GetNativeWindow()->Hide();
   }
   native_widget_delegate_->OnNativeWidgetVisibilityChanged(window->visible());
 }
 
 }  // namespace views