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

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

Issue 2133503002: arc: Revamp the ArcBridgeService interface (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: More rebasing Created 4 years, 5 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 aa0dbe42cbc1a92d0ca4fbd42507ce5edf4c220d..2a6d735d5551111784869cd12884699cc3e506c8 100644
--- a/components/arc/clipboard/arc_clipboard_bridge.cc
+++ b/components/arc/clipboard/arc_clipboard_bridge.cc
@@ -29,23 +29,22 @@ namespace arc {
ArcClipboardBridge::ArcClipboardBridge(ArcBridgeService* bridge_service)
: ArcService(bridge_service), binding_(this) {
- arc_bridge_service()->AddObserver(this);
+ arc_bridge_service()->clipboard()->AddObserver(this);
}
ArcClipboardBridge::~ArcClipboardBridge() {
DCHECK(CalledOnValidThread());
- arc_bridge_service()->RemoveObserver(this);
+ arc_bridge_service()->clipboard()->RemoveObserver(this);
}
-void ArcClipboardBridge::OnClipboardInstanceReady() {
+void ArcClipboardBridge::OnInstanceReady() {
mojom::ClipboardInstance* clipboard_instance =
- arc_bridge_service()->clipboard_instance();
+ arc_bridge_service()->clipboard()->instance();
if (!clipboard_instance) {
LOG(ERROR) << "OnClipboardInstanceReady called, "
<< "but no clipboard instance found";
return;
}
-
clipboard_instance->Init(binding_.CreateInterfacePtrAndBind());
}
@@ -63,7 +62,7 @@ void ArcClipboardBridge::GetTextContent() {
clipboard->ReadText(ui::CLIPBOARD_TYPE_COPY_PASTE, &text);
mojom::ClipboardInstance* clipboard_instance =
- arc_bridge_service()->clipboard_instance();
+ arc_bridge_service()->clipboard()->instance();
clipboard_instance->OnGetTextContent(ConvertString16ToMojoString(text));
}
« no previous file with comments | « components/arc/clipboard/arc_clipboard_bridge.h ('k') | components/arc/crash_collector/arc_crash_collector_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698