Rename ImeDriver to ImeDriverMus

It is only used with mus. This also makes the class name match the file
name.

Also fix the build file so it only compiles when mus is enabled.

TBR=msw@chromium.org

Bug: none
Change-Id: I93dbc1a14051208bb0d5964fe68ec4d22201d2ce
Reviewed-on: https://chromium-review.googlesource.com/c/1495812Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Michael Wasserman <msw@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Commit-Queue: Michael Wasserman <msw@chromium.org>
Auto-Submit: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636635}

chrome/browser/ui/BUILD.gn

@@ -2946,9 +2946,11 @@ jumbo_split_static_library("ui") {
         "views/create_application_shortcut_view.h",
         "views/ssl_client_certificate_selector.cc",
         "views/ssl_client_certificate_selector.h",
+      ]
+    }
 
-        # TODO(ellyjones): Mus is not supported on Mac (there is no ui::Window
-        # apart from aura::Window, which is also not supported).
+    if (enable_mus) {
+      sources += [
         "views/ime_driver/ime_driver_mus.cc",
         "views/ime_driver/ime_driver_mus.h",
         "views/ime_driver/remote_text_input_client.cc",

chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc

@@ -185,7 +185,7 @@ void ChromeBrowserMainExtraPartsAsh::ServiceManagerConnectionStarted(
 
 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
   // IME driver must be available at login screen, so initialize before profile.
-  IMEDriver::Register();
+  IMEDriverMus::Register();
 
   // NetworkConnect handles the network connection state machine for the UI.
   network_connect_delegate_ =

chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

@@ -29,7 +29,6 @@
 #include "services/ws/public/cpp/gpu/gpu.h"  // nogncheck
 #include "services/ws/public/mojom/constants.mojom.h"
 #include "ui/display/screen.h"
-#include "ui/views/mus/mus_client.h"
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #include "ui/wm/core/wm_state.h"
 #endif  // defined(USE_AURA)

chrome/browser/ui/views/ime_driver/ime_driver_mus.cc

@@ -22,17 +22,17 @@
 #include "chrome/browser/ui/views/ime_driver/simple_input_method.h"
 #endif  // defined(OS_CHROMEOS)
 
-IMEDriver::IMEDriver() {
+IMEDriverMus::IMEDriverMus() {
   ui::IMEBridge::Initialize();
 }
 
-IMEDriver::~IMEDriver() {}
+IMEDriverMus::~IMEDriverMus() {}
 
 // static
-void IMEDriver::Register() {
+void IMEDriverMus::Register() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   ws::mojom::IMEDriverPtr ime_driver_ptr;
-  mojo::MakeStrongBinding(std::make_unique<IMEDriver>(),
+  mojo::MakeStrongBinding(std::make_unique<IMEDriverMus>(),
                           MakeRequest(&ime_driver_ptr));
   ws::mojom::IMERegistrarPtr ime_registrar;
   content::ServiceManagerConnection::GetForProcess()
@@ -41,9 +41,10 @@ void IMEDriver::Register() {
   ime_registrar->RegisterDriver(std::move(ime_driver_ptr));
 }
 
-void IMEDriver::StartSession(ws::mojom::InputMethodRequest input_method_request,
-                             ws::mojom::TextInputClientPtr client,
-                             ws::mojom::SessionDetailsPtr details) {
+void IMEDriverMus::StartSession(
+    ws::mojom::InputMethodRequest input_method_request,
+    ws::mojom::TextInputClientPtr client,
+    ws::mojom::SessionDetailsPtr details) {
 #if defined(OS_CHROMEOS)
   std::unique_ptr<RemoteTextInputClient> remote_client =
       std::make_unique<RemoteTextInputClient>(std::move(client),

chrome/browser/ui/views/ime_driver/ime_driver_mus.h

@@ -9,10 +9,10 @@
 #include "services/ws/public/mojom/ime/ime.mojom.h"
 
 // Creates an InputMethodBridge when an IME session is started via mojo.
-class IMEDriver : public ws::mojom::IMEDriver {
+class IMEDriverMus : public ws::mojom::IMEDriver {
  public:
-  IMEDriver();
-  ~IMEDriver() override;
+  IMEDriverMus();
+  ~IMEDriverMus() override;
 
   // Instantiate the IME driver and register it to the UI service.
   static void Register();
@@ -23,7 +23,7 @@ class IMEDriver : public ws::mojom::IMEDriver {
                     ws::mojom::TextInputClientPtr client,
                     ws::mojom::SessionDetailsPtr details) override;
 
-  DISALLOW_COPY_AND_ASSIGN(IMEDriver);
+  DISALLOW_COPY_AND_ASSIGN(IMEDriverMus);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_IME_DRIVER_IME_DRIVER_MUS_H_