Remove dependency on ui from view_manager.

mojo/examples/wm_flow/wm/frame_controller.cc

 // Copyright 2014 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 "mojo/examples/wm_flow/wm/frame_controller.h"
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
+#include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/window_manager/window_manager_app.h"
 #include "mojo/views/native_widget_view_manager.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/layout/layout_manager.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/public/activation_client.h"
 
 class FrameController::LayoutManager : public views::LayoutManager,
@@ skipping 24 matching lines @@
                              kButtonFrameMargin, ps.width(), ps.height());
 
     ps = maximize_button_->GetPreferredSize();
     maximize_button_->SetBounds(
         close_button_->x() - kButtonFrameSpacing - ps.width(),
         kButtonFrameMargin, ps.width(), ps.height());
 
     bounds.Inset(kFrameSize,
                  close_button_->bounds().bottom() + kButtonFrameMargin,
                  kFrameSize, kFrameSize);
-    controller_->app_view_->SetBounds(bounds);
+    controller_->app_view_->SetBounds(*mojo::Rect::From(bounds));
   }
   virtual gfx::Size GetPreferredSize(const views::View* host) const override {
     return gfx::Size();
   }
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) override {
     if (sender == close_button_)
       controller_->CloseWindow();
@@ skipping 49 matching lines @@
   *app_view = app_view_;
   frame_view_->set_background(
       views::Background::CreateSolidBackground(SK_ColorBLUE));
   frame_view_->SetLayoutManager(frame_view_layout_manager_);
   frame_event_handler_.reset(new FrameEventHandler(this));
   frame_view_->AddPreTargetHandler(frame_event_handler_.get());
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.native_widget =
       new mojo::NativeWidgetViewManager(widget_, shell, view_);
-  params.bounds = gfx::Rect(view_->bounds().size());
+  params.bounds = gfx::Rect(
+      0, 0, view_->bounds().width, view_->bounds().height);
   widget_->Init(params);
   widget_->SetContentsView(frame_view_);
   widget_->Show();
 }
 
 FrameController::~FrameController() {}
 
 void FrameController::CloseWindow() {
   app_view_->Destroy();
   view_->Destroy();
 }
 
 void FrameController::ToggleMaximize() {
   if (!maximized_)
-    restored_bounds_ = view_->bounds();
+    restored_bounds_ = view_->bounds().To<gfx::Rect>();
   maximized_ = !maximized_;
   if (maximized_)
     view_->SetBounds(view_->parent()->bounds());
   else
-    view_->SetBounds(restored_bounds_);
+    view_->SetBounds(*mojo::Rect::From(restored_bounds_));
 }
 
 void FrameController::ActivateWindow() {
   aura::Window* window = window_manager_app_->GetWindowForViewId(view_->id());
   activation_client_->ActivateWindow(window);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // FrameController, mojo::ViewObserver implementation:
 
 void FrameController::OnViewDestroyed(mojo::View* view) {
   view_->RemoveObserver(this);
   delete this;
 }