Unify IMEDriver and IMEServer.

services/ui/service.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 "services/ui/service.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/platform_thread.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "components/discardable_memory/service/discardable_shared_memory_manager.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/catalog/public/cpp/resource_loader.h"
 #include "services/catalog/public/interfaces/constants.mojom.h"
 #include "services/service_manager/public/c/main.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/service_context.h"
 #include "services/ui/clipboard/clipboard_impl.h"
 #include "services/ui/common/switches.h"
 #include "services/ui/display/screen_manager.h"
+#include "services/ui/ime/ime_driver_bridge.h"
 #include "services/ui/ime/ime_registrar_impl.h"
-#include "services/ui/ime/ime_server_impl.h"
 #include "services/ui/ws/accessibility_manager.h"
 #include "services/ui/ws/display_binding.h"
 #include "services/ui/ws/display_creation_config.h"
 #include "services/ui/ws/display_manager.h"
 #include "services/ui/ws/frame_sink_manager_client_binding.h"
 #include "services/ui/ws/gpu_host.h"
 #include "services/ui/ws/user_activity_monitor.h"
 #include "services/ui/ws/user_display_manager.h"
 #include "services/ui/ws/window_server.h"
 #include "services/ui/ws/window_server_test_impl.h"
@@ skipping 44 matching lines @@
   std::unique_ptr<mojom::WindowTreeFactoryRequest> wtf_request;
   std::unique_ptr<mojom::DisplayManagerRequest> dm_request;
 };
 
 struct Service::UserState {
   std::unique_ptr<clipboard::ClipboardImpl> clipboard;
   std::unique_ptr<ws::AccessibilityManager> accessibility;
   std::unique_ptr<ws::WindowTreeHostFactory> window_tree_host_factory;
 };
 
-Service::Service()
-    : test_config_(false),
-      ime_registrar_(&ime_server_) {}
+Service::Service() : test_config_(false), ime_registrar_(&ime_driver_) {}
 
 Service::~Service() {
   // Destroy |window_server_| first, since it depends on |event_source_|.
   // WindowServer (or more correctly its Displays) may have state that needs to
   // be destroyed before GpuState as well.
   window_server_.reset();
 
 #if defined(USE_OZONE)
 #if defined(OS_CHROMEOS)
   // InputDeviceController uses ozone.
@@ skipping 109 matching lines @@
 
   window_server_.reset(new ws::WindowServer(this));
   std::unique_ptr<ws::GpuHost> gpu_host =
       base::MakeUnique<ws::DefaultGpuHost>(window_server_.get());
   std::unique_ptr<ws::FrameSinkManagerClientBinding> frame_sink_manager =
       base::MakeUnique<ws::FrameSinkManagerClientBinding>(window_server_.get(),
                                                           gpu_host.get());
   window_server_->SetGpuHost(std::move(gpu_host));
   window_server_->SetFrameSinkManager(std::move(frame_sink_manager));
 
-  ime_server_.Init(context()->connector(), test_config_);
+  ime_driver_.Init(context()->connector(), test_config_);
 
   discardable_shared_memory_manager_ =
       base::MakeUnique<discardable_memory::DiscardableSharedMemoryManager>();
 
   registry_.AddInterface<mojom::AccessibilityManager>(base::Bind(
       &Service::BindAccessibilityManagerRequest, base::Unretained(this)));
   registry_.AddInterface<mojom::Clipboard>(
       base::Bind(&Service::BindClipboardRequest, base::Unretained(this)));
   registry_.AddInterface<mojom::DisplayManager>(
       base::Bind(&Service::BindDisplayManagerRequest, base::Unretained(this)));
   registry_.AddInterface<mojom::Gpu>(
       base::Bind(&Service::BindGpuRequest, base::Unretained(this)));
   registry_.AddInterface<mojom::IMERegistrar>(
       base::Bind(&Service::BindIMERegistrarRequest, base::Unretained(this)));
-  registry_.AddInterface<mojom::IMEServer>(
-      base::Bind(&Service::BindIMEServerRequest, base::Unretained(this)));
+  registry_.AddInterface<mojom::IMEDriver>(
+      base::Bind(&Service::BindIMEDriverRequest, base::Unretained(this)));
   registry_.AddInterface<mojom::UserAccessManager>(base::Bind(
       &Service::BindUserAccessManagerRequest, base::Unretained(this)));
   registry_.AddInterface<mojom::UserActivityMonitor>(base::Bind(
       &Service::BindUserActivityMonitorRequest, base::Unretained(this)));
   registry_.AddInterface<WindowTreeHostFactory>(base::Bind(
       &Service::BindWindowTreeHostFactoryRequest, base::Unretained(this)));
   registry_.AddInterface<mojom::WindowManagerWindowTreeFactory>(
       base::Bind(&Service::BindWindowManagerWindowTreeFactoryRequest,
                  base::Unretained(this)));
   registry_.AddInterface<mojom::WindowTreeFactory>(base::Bind(
@@ skipping 127 matching lines @@
                              mojom::GpuRequest request) {
   window_server_->gpu_host()->Add(std::move(request));
 }
 
 void Service::BindIMERegistrarRequest(
     const service_manager::BindSourceInfo& source_info,
     mojom::IMERegistrarRequest request) {
   ime_registrar_.AddBinding(std::move(request));
 }
 
-void Service::BindIMEServerRequest(
+void Service::BindIMEDriverRequest(
     const service_manager::BindSourceInfo& source_info,
-    mojom::IMEServerRequest request) {
-  ime_server_.AddBinding(std::move(request));
+    mojom::IMEDriverRequest request) {
+  ime_driver_.AddBinding(std::move(request));
 }
 
 void Service::BindUserAccessManagerRequest(
     const service_manager::BindSourceInfo& source_info,
     mojom::UserAccessManagerRequest request) {
   window_server_->user_id_tracker()->Bind(std::move(request));
 }
 
 void Service::BindUserActivityMonitorRequest(
     const service_manager::BindSourceInfo& source_info,
@@ skipping 54 matching lines @@
     mojom::WindowServerTestRequest request) {
   if (!test_config_)
     return;
   mojo::MakeStrongBinding(
       base::MakeUnique<ws::WindowServerTestImpl>(window_server_.get()),
       std::move(request));
 }
 
 
 }  // namespace ui