Routes calls to WM through WS

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 "components/mus/public/cpp/window.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "ui/aura/client/default_capture_client.h"
@@ skipping 43 matching lines @@
                       const gfx::Rect& requested_bounds) override {
     SetChildBoundsDirect(child, requested_bounds);
   }
 
   aura::Window* outer_;
   aura::Window* inner_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentWindowLayoutManager);
 };
 
-void WindowManagerCallback(mus::mojom::WindowManagerErrorCode error_code) {}
-
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetMus, public:
 
 NativeWidgetMus::NativeWidgetMus(internal::NativeWidgetDelegate* delegate,
                                  mojo::Shell* shell,
                                  mus::Window* window)
     : window_(window),
       shell_(shell),
       native_widget_delegate_(delegate),
-      window_manager_(nullptr),
       show_state_before_fullscreen_(mus::mojom::SHOW_STATE_RESTORED),
       content_(new aura::Window(this)) {}
 NativeWidgetMus::~NativeWidgetMus() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetMus, private:
 
 void NativeWidgetMus::UpdateClientAreaInWindowManager() {
   NonClientView* non_client_view =
       native_widget_delegate_->AsWidget()->non_client_view();
@@ skipping 112 matching lines @@
 bool NativeWidgetMus::HasCapture() const {
   return window_tree_host_->window()->HasCapture();
 }
 
 ui::InputMethod* NativeWidgetMus::GetInputMethod() {
   return window_tree_host_->GetInputMethod();
 }
 
 void NativeWidgetMus::CenterWindow(const gfx::Size& size) {
   // TODO(beng): clear user-placed property and set preferred size property.
-  if (!window_manager_)
-    return;
-  window_manager_->SetPreferredSize(window_tree_host_->mus_window()->id(),
-                                    mojo::Size::From(size),
-                                    base::Bind(&WindowManagerCallback));
+  window_->SetPreferredSize(size);
 }
 
 void NativeWidgetMus::GetWindowPlacement(
       gfx::Rect* bounds,
       ui::WindowShowState* maximized) const {
   NOTIMPLEMENTED();
 }
 
 bool NativeWidgetMus::SetWindowTitle(const base::string16& title) {
   // TODO(beng): push title to window manager.
@@ skipping 19 matching lines @@
   NOTIMPLEMENTED();
   return gfx::Rect();
 }
 
 gfx::Rect NativeWidgetMus::GetRestoredBounds() const {
   NOTIMPLEMENTED();
   return gfx::Rect();
 }
 
 void NativeWidgetMus::SetBounds(const gfx::Rect& bounds) {
-  if (!window_manager_)
-    return;
-  window_manager_->SetBounds(window_tree_host_->mus_window()->id(),
-                             mojo::Rect::From(bounds),
-                             base::Bind(&WindowManagerCallback));
+  window_->RequestBoundsChange(bounds);
 }
 
 void NativeWidgetMus::SetSize(const gfx::Size& size) {
-  if (!window_manager_)
-    return;
-  mojo::RectPtr bounds(mojo::Rect::New());
-  bounds->x = window_tree_host_->mus_window()->bounds().x;
-  bounds->y = window_tree_host_->mus_window()->bounds().y;
-  bounds->width = size.width();
-  bounds->height = size.height();
-  window_manager_->SetBounds(window_tree_host_->mus_window()->id(),
-                             bounds.Pass(), base::Bind(&WindowManagerCallback));
+  gfx::Rect bounds = window_->bounds().To<gfx::Rect>();
+  bounds.set_size(size);
+  window_->RequestBoundsChange(bounds);
 }
 
 void NativeWidgetMus::StackAbove(gfx::NativeView native_view) {
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetMus::StackAtTop() {
   NOTIMPLEMENTED();
 }
 
@@ skipping 307 matching lines @@
   } else {
     native_widget_delegate_->OnScrollEvent(event);
   }
 }
 
 void NativeWidgetMus::OnGestureEvent(ui::GestureEvent* event) {
   native_widget_delegate_->OnGestureEvent(event);
 }
 
 }  // namespace views