arc-bridge: Introduce the ArcService class

components/arc/ime/arc_ime_ipc_host.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 "components/arc/ime/arc_ime_ipc_host.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/arc/arc_bridge_service.h"
 #include "ui/base/ime/composition_text.h"
@@ skipping 52 matching lines @@
         (composition.selection.start() == underline.start_offset &&
          composition.selection.end() == underline.end_offset));
     segments.push_back(std::move(segment));
   }
   return segments;
 }
 
 }  // namespace
 
 ArcImeIpcHost::ArcImeIpcHost(Delegate* delegate,
-                             ArcBridgeService* bridge_service)
-    : binding_(this), delegate_(delegate), bridge_service_(bridge_service) {
-  bridge_service_->AddObserver(this);
+                             ArcBridgeService* arc_bridge_service)
+    : arc_bridge_service_(arc_bridge_service),
+      binding_(this),
+      delegate_(delegate) {
+  DCHECK(arc_bridge_service_);
+  arc_bridge_service_->AddObserver(this);
+
+  // If ImeInstance was ready before we AddObserver(), we won't get
+  // OnImeInstanceReady events. For such case, we have to call it
+  // explicitly.
+  if (arc_bridge_service_->ime_instance())
+    OnImeInstanceReady();
 }
 
 ArcImeIpcHost::~ArcImeIpcHost() {
-  bridge_service_->RemoveObserver(this);
+  arc_bridge_service_->RemoveObserver(this);
 }
 
 void ArcImeIpcHost::OnImeInstanceReady() {
   arc::ImeHostPtr host;
   binding_.Bind(mojo::GetProxy(&host));
-  bridge_service_->ime_instance()->Init(std::move(host));
+  arc_bridge_service_->ime_instance()->Init(std::move(host));
 }
 
 void ArcImeIpcHost::SendSetCompositionText(
     const ui::CompositionText& composition) {
-  ImeInstance* ime_instance = bridge_service_->ime_instance();
+  ImeInstance* ime_instance = arc_bridge_service_->ime_instance();
   if (!ime_instance) {
     LOG(ERROR) << "ArcImeInstance method called before being ready.";
     return;
   }
 
   ime_instance->SetCompositionText(base::UTF16ToUTF8(composition.text),
                                    ConvertSegments(composition));
 }
 
 void ArcImeIpcHost::SendConfirmCompositionText() {
-  ImeInstance* ime_instance = bridge_service_->ime_instance();
+  ImeInstance* ime_instance = arc_bridge_service_->ime_instance();
   if (!ime_instance) {
     LOG(ERROR) << "ArcImeInstance method called before being ready.";
     return;
   }
 
   ime_instance->ConfirmCompositionText();
 }
 
 void ArcImeIpcHost::SendInsertText(const base::string16& text) {
-  ImeInstance* ime_instance = bridge_service_->ime_instance();
+  ImeInstance* ime_instance = arc_bridge_service_->ime_instance();
   if (!ime_instance) {
     LOG(ERROR) << "ArcImeInstance method called before being ready.";
     return;
   }
 
   ime_instance->InsertText(base::UTF16ToUTF8(text));
 }
 
 void ArcImeIpcHost::OnTextInputTypeChanged(arc::TextInputType type) {
   delegate_->OnTextInputTypeChanged(ConvertTextInputType(type));
 }
 
 void ArcImeIpcHost::OnCursorRectChanged(arc::CursorRectPtr rect) {
   delegate_->OnCursorRectChanged(gfx::Rect(
       rect->left,
       rect->top,
       rect->right - rect->left,
       rect->bottom - rect->top));
 }
 
 }  // namespace arc