IME for Mus: Use the catalog service to decide IME driver's name.

services/ui/ime/ime_server_impl.cc

 // 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.
 
 #include "services/ui/ime/ime_server_impl.h"
 
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/ime/ime_registrar_impl.h"
 
 namespace ui {
 
 IMEServerImpl::IMEServerImpl() : current_id_(0) {}
 
 IMEServerImpl::~IMEServerImpl() {}
 
 void IMEServerImpl::Init(service_manager::Connector* connector) {
-  // TODO(moshayedi): crbug.com/641041. Look up the driver from the mojo:catalog
-  // service.
-  connector->Connect("service:test_ime_driver");
+  connector_ = connector;
+  connector_->ConnectToInterface("service:catalog", &catalog_);
+  catalog_->GetEntriesProvidingCapability(
+      "ime:ime_driver",
+      base::Bind(&IMEServerImpl::OnGotCatalogEntries, base::Unretained(this)));
 }
 
 void IMEServerImpl::AddBinding(mojom::IMEServerRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 void IMEServerImpl::OnDriverChanged(mojom::IMEDriverPtr driver) {
   driver_ = std::move(driver);
 
   while (!pending_requests_.empty()) {
@@ skipping 13 matching lines @@
     // parameter of InputMethod::OnCaretBoundsChanged() here and limit them to
     // client's focused window.
     driver_->StartSession(current_id_++, std::move(client),
                           std::move(input_method_request));
   } else {
     pending_requests_.push(
         std::make_pair(std::move(client), std::move(input_method_request)));
   }
 }
 
+void IMEServerImpl::OnGotCatalogEntries(
+    std::vector<catalog::mojom::EntryPtr> entries) {
+  // TODO(moshayedi): crbug.com/662157. Decide what to do when number of
+  // available IME drivers isn't exactly one.
+  if (entries.size() == 0)
+    return;
+  connector_->Connect((*entries.begin())->name);
+}
+
 }  // namespace ui