arc: Revamp the ArcBridgeService interface

components/arc/ime/arc_ime_bridge_impl.cc

Index: components/arc/ime/arc_ime_bridge_impl.cc
diff --git a/components/arc/ime/arc_ime_bridge_impl.cc b/components/arc/ime/arc_ime_bridge_impl.cc
index 6b375d9c49776d18d7362f0ed758f568ef8ef255..be8006c655f1dd9d4e4b325b499bc5f7434153a7 100644
--- a/components/arc/ime/arc_ime_bridge_impl.cc
+++ b/components/arc/ime/arc_ime_bridge_impl.cc
@@ -63,9 +63,10 @@ mojo::Array<arc::mojom::CompositionSegmentPtr> ConvertSegments(
         arc::mojom::CompositionSegment::New();
     segment->start_offset = underline.start_offset;
     segment->end_offset = underline.end_offset;
-    segment->emphasized = (underline.thick ||
-        (composition.selection.start() == underline.start_offset &&
-         composition.selection.end() == underline.end_offset));
+    segment->emphasized =
+        (underline.thick ||
+         (composition.selection.start() == underline.start_offset &&
+          composition.selection.end() == underline.end_offset));
     segments.push_back(std::move(segment));
   }
   return segments;
@@ -76,20 +77,21 @@ mojo::Array<arc::mojom::CompositionSegmentPtr> ConvertSegments(
 ArcImeBridgeImpl::ArcImeBridgeImpl(Delegate* delegate,
                                    ArcBridgeService* bridge_service)
     : binding_(this), delegate_(delegate), bridge_service_(bridge_service) {
-  bridge_service_->AddObserver(this);
+  bridge_service_->ime()->AddObserver(this);
 }
 
 ArcImeBridgeImpl::~ArcImeBridgeImpl() {
-  bridge_service_->RemoveObserver(this);
+  bridge_service_->ime()->RemoveObserver(this);
 }
 
-void ArcImeBridgeImpl::OnImeInstanceReady() {
-  bridge_service_->ime_instance()->Init(binding_.CreateInterfacePtrAndBind());
+void ArcImeBridgeImpl::OnInstanceReady(mojom::ImeInstance* ime_instance,
+                                       uint32_t version) {
+  ime_instance->Init(binding_.CreateInterfacePtrAndBind());
 }
 
 void ArcImeBridgeImpl::SendSetCompositionText(
     const ui::CompositionText& composition) {
-  mojom::ImeInstance* ime_instance = bridge_service_->ime_instance();
+  mojom::ImeInstance* ime_instance = bridge_service_->ime()->instance();
   if (!ime_instance) {
     LOG(ERROR) << "ArcImeInstance method called before being ready.";
     return;
@@ -100,7 +102,7 @@ void ArcImeBridgeImpl::SendSetCompositionText(
 }
 
 void ArcImeBridgeImpl::SendConfirmCompositionText() {
-  mojom::ImeInstance* ime_instance = bridge_service_->ime_instance();
+  mojom::ImeInstance* ime_instance = bridge_service_->ime()->instance();
   if (!ime_instance) {
     LOG(ERROR) << "ArcImeInstance method called before being ready.";
     return;
@@ -110,7 +112,7 @@ void ArcImeBridgeImpl::SendConfirmCompositionText() {
 }
 
 void ArcImeBridgeImpl::SendInsertText(const base::string16& text) {
-  mojom::ImeInstance* ime_instance = bridge_service_->ime_instance();
+  mojom::ImeInstance* ime_instance = bridge_service_->ime()->instance();
   if (!ime_instance) {
     LOG(ERROR) << "ArcImeInstance method called before being ready.";
     return;
@@ -121,12 +123,12 @@ void ArcImeBridgeImpl::SendInsertText(const base::string16& text) {
 
 void ArcImeBridgeImpl::SendOnKeyboardBoundsChanging(
     const gfx::Rect& new_bounds) {
-  mojom::ImeInstance* ime_instance = bridge_service_->ime_instance();
+  mojom::ImeInstance* ime_instance = bridge_service_->ime()->instance();
   if (!ime_instance) {
     LOG(ERROR) << "ArcImeInstance method called before being ready.";
     return;
   }
-  if (bridge_service_->ime_version() <
+  if (bridge_service_->ime()->version() <
       kMinVersionForOnKeyboardsBoundsChanging) {
     LOG(ERROR) << "ArcImeInstance is too old for OnKeyboardsBoundsChanging.";
     return;
@@ -140,11 +142,9 @@ void ArcImeBridgeImpl::OnTextInputTypeChanged(arc::mojom::TextInputType type) {
 }
 
 void ArcImeBridgeImpl::OnCursorRectChanged(arc::mojom::CursorRectPtr rect) {
-  delegate_->OnCursorRectChanged(gfx::Rect(
-      rect->left,
-      rect->top,
-      rect->right - rect->left,
-      rect->bottom - rect->top));
+  delegate_->OnCursorRectChanged(gfx::Rect(rect->left, rect->top,
+                                           rect->right - rect->left,
+                                           rect->bottom - rect->top));
 }
 
 void ArcImeBridgeImpl::OnCancelComposition() {