Unify IMEDriver and IMEServer.

services/ui/service.h

 // 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.
 
 #ifndef SERVICES_UI_SERVICE_H_
 #define SERVICES_UI_SERVICE_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "components/discardable_memory/public/interfaces/discardable_shared_memory_manager.mojom.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/cpp/service_runner.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/input_devices/input_device_server.h"
 #include "services/ui/public/interfaces/accessibility_manager.mojom.h"
 #include "services/ui/public/interfaces/clipboard.mojom.h"
 #include "services/ui/public/interfaces/display_manager.mojom.h"
 #include "services/ui/public/interfaces/gpu.mojom.h"
 #include "services/ui/public/interfaces/ime/ime.mojom.h"
 #include "services/ui/public/interfaces/user_access_manager.mojom.h"
 #include "services/ui/public/interfaces/user_activity_monitor.mojom.h"
 #include "services/ui/public/interfaces/window_manager_window_tree_factory.mojom.h"
 #include "services/ui/public/interfaces/window_server_test.mojom.h"
@@ skipping 79 matching lines @@
       const service_manager::BindSourceInfo& source_info,
       mojom::DisplayManagerRequest request);
 
   void BindGpuRequest(const service_manager::BindSourceInfo& source_info,
                       mojom::GpuRequest request);
 
   void BindIMERegistrarRequest(
       const service_manager::BindSourceInfo& source_info,
       mojom::IMERegistrarRequest request);
 
-  void BindIMEServerRequest(const service_manager::BindSourceInfo& source_info,
-                            mojom::IMEServerRequest request);
+  void BindIMEDriverRequest(const service_manager::BindSourceInfo& source_info,
+                            mojom::IMEDriverRequest request);
 
   void BindUserAccessManagerRequest(
       const service_manager::BindSourceInfo& source_info,
       mojom::UserAccessManagerRequest request);
 
   void BindUserActivityMonitorRequest(
       const service_manager::BindSourceInfo& source_info,
       mojom::UserActivityMonitorRequest request);
 
   void BindWindowManagerWindowTreeFactoryRequest(
@@ skipping 33 matching lines @@
 #if defined(OS_CHROMEOS)
   std::unique_ptr<InputDeviceController> input_device_controller_;
 #endif
 #endif
 
   // Manages display hardware and handles display management. May register Mojo
   // interfaces and must outlive |registry_|.
   std::unique_ptr<display::ScreenManager> screen_manager_;
 
   IMERegistrarImpl ime_registrar_;
-  IMEServerImpl ime_server_;
+  IMEDriverBridge ime_driver_;
 
   std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager>
       discardable_shared_memory_manager_;
 
   service_manager::BinderRegistry registry_;
 
   // Set to true in StartDisplayInit().
   bool is_gpu_ready_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(Service);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_SERVICE_H_