OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "components/arc/clipboard/arc_clipboard_bridge.h" | 5 #include "components/arc/clipboard/arc_clipboard_bridge.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
11 #include "base/threading/thread_checker.h" | 11 #include "base/threading/thread_checker.h" |
12 #include "ui/base/clipboard/clipboard.h" | 12 #include "ui/base/clipboard/clipboard.h" |
13 #include "ui/base/clipboard/clipboard_types.h" | 13 #include "ui/base/clipboard/clipboard_types.h" |
14 #include "ui/base/clipboard/scoped_clipboard_writer.h" | 14 #include "ui/base/clipboard/scoped_clipboard_writer.h" |
15 | 15 |
16 namespace { | 16 namespace { |
17 | 17 |
18 static base::string16 ConvertMojoStringToString16(const mojo::String& input) { | 18 static base::string16 ConvertMojoStringToString16(const mojo::String& input) { |
19 return base::UTF8ToUTF16(input.get()); | 19 return base::UTF8ToUTF16(input.get()); |
20 } | 20 } |
21 | 21 |
22 static mojo::String ConvertString16ToMojoString(const base::string16& input) { | 22 static mojo::String ConvertString16ToMojoString(const base::string16& input) { |
23 return mojo::String(base::UTF16ToUTF8(input)); | 23 return mojo::String(base::UTF16ToUTF8(input)); |
24 } | 24 } |
25 | 25 |
26 } // namespace | 26 } // namespace |
27 | 27 |
28 namespace arc { | 28 namespace arc { |
29 | 29 |
30 ArcClipboardBridge::ArcClipboardBridge(ArcBridgeService* bridge_service) | 30 ArcClipboardBridge::ArcClipboardBridge(ArcBridgeService* arc_bridge) |
31 : bridge_service_(bridge_service), binding_(this) { | 31 : bridge_service_(arc_bridge), binding_(this) { |
32 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.
| |
32 bridge_service_->AddObserver(this); | 33 bridge_service_->AddObserver(this); |
34 | |
35 // If ClipboardInstance was ready before we AddObserver(), we won't get | |
36 // OnClipboardInstanceReady events. For such case, we have to call it | |
37 // explicitly. | |
38 if (bridge_service_->clipboard_instance()) | |
39 OnClipboardInstanceReady(); | |
33 } | 40 } |
34 | 41 |
35 ArcClipboardBridge::~ArcClipboardBridge() { | 42 ArcClipboardBridge::~ArcClipboardBridge() { |
36 DCHECK(CalledOnValidThread()); | 43 DCHECK(CalledOnValidThread()); |
37 bridge_service_->RemoveObserver(this); | 44 bridge_service_->RemoveObserver(this); |
38 } | 45 } |
39 | 46 |
40 void ArcClipboardBridge::OnClipboardInstanceReady() { | 47 void ArcClipboardBridge::OnClipboardInstanceReady() { |
41 ClipboardInstance* clipboard_instance = bridge_service_->clipboard_instance(); | 48 ClipboardInstance* clipboard_instance = bridge_service_->clipboard_instance(); |
42 if (!clipboard_instance) { | 49 if (!clipboard_instance) { |
(...skipping 23 matching lines...) Expand all Loading... | |
66 ClipboardInstance* clipboard_instance = bridge_service_->clipboard_instance(); | 73 ClipboardInstance* clipboard_instance = bridge_service_->clipboard_instance(); |
67 clipboard_instance->OnGetTextContent(ConvertString16ToMojoString(text)); | 74 clipboard_instance->OnGetTextContent(ConvertString16ToMojoString(text)); |
68 } | 75 } |
69 | 76 |
70 bool ArcClipboardBridge::CalledOnValidThread() { | 77 bool ArcClipboardBridge::CalledOnValidThread() { |
71 // Make sure access to the Chrome clipboard is happening in the UI thread. | 78 // Make sure access to the Chrome clipboard is happening in the UI thread. |
72 return thread_checker_.CalledOnValidThread(); | 79 return thread_checker_.CalledOnValidThread(); |
73 } | 80 } |
74 | 81 |
75 } // namespace arc | 82 } // namespace arc |
OLD | NEW |