Remove dependency on ui from view_manager.

mojo/examples/media_viewer/media_viewer.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 <map>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 146 matching lines @@
       button->SetBorder(scoped_ptr<views::Border>(new CustomButtonBorder));
       buttons_[type] = button;
       widget_delegate->GetContentsView()->AddChildView(button);
     }
 
     views::Widget* widget = new views::Widget;
     views::Widget::InitParams params(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.native_widget = new NativeWidgetViewManager(widget, shell, view);
     params.delegate = widget_delegate;
-    params.bounds = gfx::Rect(view->bounds().width(), view->bounds().height());
+    params.bounds = gfx::Rect(view->bounds().width, view->bounds().height);
     params.opacity = views::Widget::InitParams::OPAQUE_WINDOW;
     widget->Init(params);
     widget->Show();
   }
 
  private:
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) override {
     for (int i = 0; i < CONTROL_COUNT; ++i) {
@@ skipping 47 matching lines @@
   }
 
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       override {
     connection->AddService(view_manager_client_factory_.get());
     return true;
   }
 
   void LayoutViews() {
     View* root = content_view_->parent();
-    gfx::Rect control_bounds(root->bounds().width(), 28);
+    Rect control_bounds;
+    control_bounds.width = root->bounds().width;
+    control_bounds.height = 28;
     control_view_->SetBounds(control_bounds);
-    gfx::Rect content_bounds(0, control_bounds.height(), root->bounds().width(),
-                             root->bounds().height() - control_bounds.height());
+    Rect content_bounds;
+    content_bounds.y = control_bounds.height;
+    content_bounds.width = root->bounds().width;
+    content_bounds.height = root->bounds().height - control_bounds.height;
     content_view_->SetBounds(content_bounds);
   }
 
   // Overridden from ViewManagerDelegate:
   virtual void OnEmbed(ViewManager* view_manager,
                        View* root,
                        ServiceProviderImpl* exported_services,
                        scoped_ptr<ServiceProvider> imported_services) override {
     root_view_ = root;
     view_manager_ = view_manager;
@@ skipping 31 matching lines @@
       case ControlPanel::CONTROL_ZOOM_OUT:
         zoomable_media_->ZoomOut();
         break;
       default:
         NOTIMPLEMENTED();
     }
   }
 
   // ViewObserver:
   virtual void OnViewBoundsChanged(View* view,
-                                   const gfx::Rect& old_bounds,
-                                   const gfx::Rect& new_bounds) override {
+                                   const Rect& old_bounds,
+                                   const Rect& new_bounds) override {
     LayoutViews();
   }
   virtual void OnViewDestroyed(View* view) override {
     DCHECK_EQ(view, root_view_);
     view->RemoveObserver(this);
     root_view_ = NULL;
   }
 
   std::string GetHandlerForContentType(const std::string& content_type) {
     HandlerMap::const_iterator it = handler_map_.find(content_type);
@@ skipping 17 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(MediaViewer);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   mojo::ApplicationRunnerChromium runner(new mojo::examples::MediaViewer);
   return runner.Run(shell_handle);
 }