Unify IMEDriver and IMEServer.

services/ui/public/interfaces/ime/ime.mojom

 // Copyright 2016 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.
 
 module ui.mojom;
 
 import "mojo/common/text_direction.mojom";
 import "ui/events/mojo/event.mojom";
 import "ui/gfx/geometry/mojo/geometry.mojom";
 import "ui/gfx/range/mojo/range.mojom";
@@ skipping 112 matching lines @@
   mojo.common.mojom.TextDirection text_direction;
   int32 text_input_flags;
   gfx.mojom.Rect caret_bounds;
 };
 
 // A service which provides the IMEDriver interface is responsible for doing
 // the composition logic. After starting a session, it receives events from
 // the client via the InputMethod interface, and sends composition events to
 // the client via the TextInputClient.
 interface IMEDriver {
-  // session_id is unique and generated by Mus.
-  StartSession(int32 session_id, StartSessionDetails details);
-  CancelSession(int32 session_id);
-};
-
-// Clients use IME using the IMEServer interface which is provided by Mus. Mus
-// does minimal processing and mostly just acts as lightweight proxy between
-// the client app and the registered IME driver.
-interface IMEServer {
   StartSession(StartSessionDetails details);
 };
 
 // An IME driver register should register itself to Mus using the IMERegistrar
 // interface.
 interface IMERegistrar {
   RegisterDriver(IMEDriver driver);
 };
 
 // A client sends updates to the IME driver using the InputMethod interface.
@@ skipping 40 matching lines @@
   // the character is not processed. See ui::TextInputClient::InsertChar()
   // for more details.
   InsertChar(ui.mojom.Event event);
 
   // TODO(moshayedi): Add functions corresponding to ui::TextInputClient for:
   // - Input context information
   // - Document content operations
   // - Miscellaneous functions
   // crbug.com/631527.
 };