Moves mandoline/ui/aura to ui/views/mus

ui/views/mus/window_tree_host_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 "mandoline/ui/aura/window_tree_host_mojo.h"
+#include "ui/views/mus/window_tree_host_mus.h"
 
 #include "components/mus/public/cpp/view_tree_connection.h"
-#include "mandoline/ui/aura/input_method_mandoline.h"
-#include "mandoline/ui/aura/surface_context_factory.h"
 #include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
+#include "ui/views/mus/input_method_mus.h"
+#include "ui/views/mus/surface_context_factory.h"
 
-namespace mandoline {
+namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostMojo, public:
 
 WindowTreeHostMojo::WindowTreeHostMojo(mojo::Shell* shell, mus::View* view)
     : view_(view), bounds_(view->bounds().To<gfx::Rect>()) {
   view_->AddObserver(this);
 
   context_factory_.reset(new SurfaceContextFactory(shell, view_));
   // WindowTreeHost creates the compositor using the ContextFactory from
   // aura::Env. Install |context_factory_| there so that |context_factory_| is
   // picked up.
   ui::ContextFactory* default_context_factory =
       aura::Env::GetInstance()->context_factory();
   aura::Env::GetInstance()->set_context_factory(context_factory_.get());
   CreateCompositor();
   OnAcceleratedWidgetAvailable();
   aura::Env::GetInstance()->set_context_factory(default_context_factory);
   DCHECK_EQ(context_factory_.get(), compositor()->context_factory());
 
-  input_method_.reset(new InputMethodMandoline(this, view_));
+  input_method_.reset(new InputMethodMUS(this, view_));
   SetSharedInputMethod(input_method_.get());
 }
 
 WindowTreeHostMojo::~WindowTreeHostMojo() {
   view_->RemoveObserver(this);
   DestroyCompositor();
   DestroyDispatcher();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowTreeHostMojo, aura::WindowTreeHost implementation:
 
 ui::EventSource* WindowTreeHostMojo::GetEventSource() {
   return this;
 }
 
 gfx::AcceleratedWidget WindowTreeHostMojo::GetAcceleratedWidget() {
   return gfx::kNullAcceleratedWidget;
 }
 
 void WindowTreeHostMojo::ShowImpl() {
   window()->Show();
 }
 
-void WindowTreeHostMojo::HideImpl() {
-}
+void WindowTreeHostMojo::HideImpl() {}
 
 gfx::Rect WindowTreeHostMojo::GetBounds() const {
   return bounds_;
 }
 
 void WindowTreeHostMojo::SetBounds(const gfx::Rect& bounds) {
   window()->SetBounds(gfx::Rect(bounds.size()));
 }
 
 gfx::Point WindowTreeHostMojo::GetLocationOnNativeScreen() const {
@@ skipping 28 matching lines @@
                                              const mojo::Rect& new_bounds) {
   gfx::Rect old_bounds2 = old_bounds.To<gfx::Rect>();
   gfx::Rect new_bounds2 = new_bounds.To<gfx::Rect>();
   bounds_ = new_bounds2;
   if (old_bounds2.origin() != new_bounds2.origin())
     OnHostMoved(bounds_.origin());
   if (old_bounds2.size() != new_bounds2.size())
     OnHostResized(bounds_.size());
 }
 
-}  // namespace mandoline
+}  // namespace views