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

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

Issue 1596663002: arc-bridge: Introduce the ArcService class (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: Fixed Chrome OS build Created 4 years, 11 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 06e39fb4b5e2ccfe2b911ca21ba78ddf507e9a88..f291712c4ddef755d3cc67ee17147d9a3e1f7456 100644
--- a/components/arc/clipboard/arc_clipboard_bridge.cc
+++ b/components/arc/clipboard/arc_clipboard_bridge.cc
@@ -27,9 +27,16 @@ static mojo::String ConvertString16ToMojoString(const base::string16& input) {
namespace arc {
-ArcClipboardBridge::ArcClipboardBridge(ArcBridgeService* bridge_service)
- : bridge_service_(bridge_service), binding_(this) {
+ArcClipboardBridge::ArcClipboardBridge(ArcBridgeService* arc_bridge)
+ : bridge_service_(arc_bridge), binding_(this) {
+ DCHECK(bridge_service_);
hidehiko 2016/01/18 01:26:45 nit: while you're here, could you standardize the
Luis Héctor Chávez 2016/01/19 17:43:54 Done.
bridge_service_->AddObserver(this);
+
+ // If ClipboardInstance was ready before we AddObserver(), we won't get
+ // OnClipboardInstanceReady events. For such case, we have to call it
+ // explicitly.
+ if (bridge_service_->clipboard_instance())
+ OnClipboardInstanceReady();
}
ArcClipboardBridge::~ArcClipboardBridge() {

Powered by Google App Engine
This is Rietveld 408576698