Enable Config::MUS to use classic IME instead of servicified IME.

ui/aura/mus/input_method_mus.h

Index: ui/aura/mus/input_method_mus.h
diff --git a/ui/aura/mus/input_method_mus.h b/ui/aura/mus/input_method_mus.h
index e1b3d3c5aa82c5d16686282237cd023e3a265acd..5944ac15d59754632774c2092206020c5eb53d44 100644
--- a/ui/aura/mus/input_method_mus.h
+++ b/ui/aura/mus/input_method_mus.h
@@ -14,12 +14,6 @@
 #include "ui/aura/aura_export.h"
 #include "ui/base/ime/input_method_base.h"
 
-namespace ui {
-namespace mojom {
-enum class EventResult;
-}
-}
-
 namespace aura {
 
 class InputMethodMusTestApi;
@@ -28,14 +22,14 @@ class Window;
 
 class AURA_EXPORT InputMethodMus : public ui::InputMethodBase {
  public:
-  using EventResultCallback = base::Callback<void(ui::mojom::EventResult)>;

[sky, 2017/04/20 20:18:49]

Is there a reason to remove the type? Having an explicit type makes for less
confusing as to what true and false mean.

+  using AckCallback = base::Callback<void(bool)>;
 
   InputMethodMus(ui::internal::InputMethodDelegate* delegate, Window* window);
   ~InputMethodMus() override;
 
   void Init(service_manager::Connector* connector);
   void DispatchKeyEvent(ui::KeyEvent* event,
-                        std::unique_ptr<EventResultCallback> ack_callback);
+                        std::unique_ptr<AckCallback> ack_callback);
 
   // Overridden from ui::InputMethod:
   void OnFocus() override;
@@ -54,9 +48,8 @@ class AURA_EXPORT InputMethodMus : public ui::InputMethodBase {
   friend TextInputClientImpl;
 
   // Called from DispatchKeyEvent() to call to the InputMethod.
-  void SendKeyEventToInputMethod(
-      const ui::KeyEvent& event,
-      std::unique_ptr<EventResultCallback> ack_callback);
+  void SendKeyEventToInputMethod(const ui::KeyEvent& event,
+                                 std::unique_ptr<AckCallback> ack_callback);
 
   // Overridden from ui::InputMethodBase:
   void OnDidChangeFocusedClient(ui::TextInputClient* focused_before,
@@ -89,7 +82,7 @@ class AURA_EXPORT InputMethodMus : public ui::InputMethodBase {
   // Callbacks supplied to DispatchKeyEvent() are added here while awaiting
   // the response from the server. These are removed when the response is
   // received (ProcessKeyEventCallback()).
-  std::deque<std::unique_ptr<EventResultCallback>> pending_callbacks_;
+  std::deque<std::unique_ptr<AckCallback>> pending_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodMus);
 };