Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(354)

Unified Diff: components/arc/clipboard/arc_clipboard_bridge.cc

Issue 2357053002: Always use arc::InstanceHolder<T>::GetInstanceForMethod (Closed)
Patch Set: review Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/arc/clipboard/arc_clipboard_bridge.cc
diff --git a/components/arc/clipboard/arc_clipboard_bridge.cc b/components/arc/clipboard/arc_clipboard_bridge.cc
index 2a6d735d5551111784869cd12884699cc3e506c8..536573261a5c5af870dc7c0e15c2ff713ee91501 100644
--- a/components/arc/clipboard/arc_clipboard_bridge.cc
+++ b/components/arc/clipboard/arc_clipboard_bridge.cc
@@ -39,12 +39,9 @@ ArcClipboardBridge::~ArcClipboardBridge() {
void ArcClipboardBridge::OnInstanceReady() {
mojom::ClipboardInstance* clipboard_instance =
- arc_bridge_service()->clipboard()->instance();
- if (!clipboard_instance) {
- LOG(ERROR) << "OnClipboardInstanceReady called, "
- << "but no clipboard instance found";
+ arc_bridge_service()->clipboard()->GetInstanceForMethod("Init");
+ if (!clipboard_instance)
return;
- }
clipboard_instance->Init(binding_.CreateInterfacePtrAndBind());
}
@@ -62,7 +59,10 @@ void ArcClipboardBridge::GetTextContent() {
clipboard->ReadText(ui::CLIPBOARD_TYPE_COPY_PASTE, &text);
mojom::ClipboardInstance* clipboard_instance =
- arc_bridge_service()->clipboard()->instance();
+ arc_bridge_service()->clipboard()->GetInstanceForMethod(
+ "OnGetTextContent");
+ if (!clipboard_instance)
+ return;
clipboard_instance->OnGetTextContent(ConvertString16ToMojoString(text));
}

Powered by Google App Engine
This is Rietveld 408576698