Make aura work with mus

ui/aura/mus/input_method_mus.cc

 // Copyright (c) 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/input_method_mus.h"
+#include "ui/aura/mus/input_method_mus.h"
 
 #include <utility>
 
-#include "services/ui/public/cpp/window.h"
 #include "services/ui/public/interfaces/ime.mojom.h"
+#include "services/ui/public/interfaces/window_tree_constants.mojom.h"
+#include "ui/aura/mus/text_input_client_impl.h"
+#include "ui/aura/mus/window_port_mus.h"
+#include "ui/aura/window.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/events/event.h"
 #include "ui/platform_window/mojo/ime_type_converters.h"
 #include "ui/platform_window/mojo/text_input_state.mojom.h"
-#include "ui/views/mus/text_input_client_impl.h"
 
 using ui::mojom::EventResult;
 
-namespace views {
+namespace aura {
 
 ////////////////////////////////////////////////////////////////////////////////
 // InputMethodMus, public:
 
 InputMethodMus::InputMethodMus(ui::internal::InputMethodDelegate* delegate,
-                               ui::Window* window)
+                               Window* window)
     : window_(window) {
   SetDelegate(delegate);
 }
 
 InputMethodMus::~InputMethodMus() {}
 
 void InputMethodMus::Init(service_manager::Connector* connector) {
   connector->ConnectToInterface("service:ui", &ime_server_);
 }
 
@@ skipping 87 matching lines @@
   text_input_client_ = base::MakeUnique<TextInputClientImpl>(focused);
   ime_server_->StartSession(text_input_client_->CreateInterfacePtrAndBind(),
                             GetProxy(&input_method_));
 }
 
 void InputMethodMus::UpdateTextInputType() {
   ui::TextInputType type = GetTextInputType();
   mojo::TextInputStatePtr state = mojo::TextInputState::New();
   state->type = mojo::ConvertTo<mojo::TextInputType>(type);
   if (window_) {
+    WindowPortMus* window_impl_mus = WindowPortMus::Get(window_);
     if (type != ui::TEXT_INPUT_TYPE_NONE)
-      window_->SetImeVisibility(true, std::move(state));
+      window_impl_mus->SetImeVisibility(true, std::move(state));
     else
-      window_->SetTextInputState(std::move(state));
+      window_impl_mus->SetTextInputState(std::move(state));
   }
 }
 
 void InputMethodMus::ProcessKeyEventCallback(
     const ui::KeyEvent& event,
     std::unique_ptr<base::Callback<void(EventResult)>> ack_callback,
     bool handled) {
   EventResult event_result;
   if (!handled) {
     // If not handled by IME, try dispatching the event to delegate to see if
     // any client-side post-ime processing needs to be done. This includes cases
     // like backspace, return key, etc.
     std::unique_ptr<ui::Event> event_clone = ui::Event::Clone(event);
     ignore_result(DispatchKeyEventPostIME(event_clone->AsKeyEvent()));
     event_result =
         event_clone->handled() ? EventResult::HANDLED : EventResult::UNHANDLED;
   } else {
     event_result = EventResult::HANDLED;
   }
   // |ack_callback| can be null if the standard form of DispatchKeyEvent() is
   // called instead of the version which provides a callback. In mus+ash we
   // use the version with callback, but some unittests use the standard form.
   if (ack_callback)
     ack_callback->Run(event_result);
 }
 
-}  // namespace views
+}  // namespace aura