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" |
(...skipping 10 matching lines...) Expand all Loading... |
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* bridge_service) |
31 : bridge_service_(bridge_service), binding_(this) { | 31 : ArcService(bridge_service), binding_(this) { |
32 bridge_service_->AddObserver(this); | 32 arc_bridge_service()->AddObserver(this); |
33 } | 33 } |
34 | 34 |
35 ArcClipboardBridge::~ArcClipboardBridge() { | 35 ArcClipboardBridge::~ArcClipboardBridge() { |
36 DCHECK(CalledOnValidThread()); | 36 DCHECK(CalledOnValidThread()); |
37 bridge_service_->RemoveObserver(this); | 37 arc_bridge_service()->RemoveObserver(this); |
38 } | 38 } |
39 | 39 |
40 void ArcClipboardBridge::OnClipboardInstanceReady() { | 40 void ArcClipboardBridge::OnClipboardInstanceReady() { |
41 ClipboardInstance* clipboard_instance = bridge_service_->clipboard_instance(); | 41 ClipboardInstance* clipboard_instance = |
| 42 arc_bridge_service()->clipboard_instance(); |
42 if (!clipboard_instance) { | 43 if (!clipboard_instance) { |
43 LOG(ERROR) << "OnClipboardInstanceReady called, " | 44 LOG(ERROR) << "OnClipboardInstanceReady called, " |
44 << "but no clipboard instance found"; | 45 << "but no clipboard instance found"; |
45 return; | 46 return; |
46 } | 47 } |
47 | 48 |
48 ClipboardHostPtr host; | 49 ClipboardHostPtr host; |
49 binding_.Bind(mojo::GetProxy(&host)); | 50 binding_.Bind(mojo::GetProxy(&host)); |
50 clipboard_instance->Init(std::move(host)); | 51 clipboard_instance->Init(std::move(host)); |
51 } | 52 } |
52 | 53 |
53 void ArcClipboardBridge::SetTextContent(const mojo::String& text) { | 54 void ArcClipboardBridge::SetTextContent(const mojo::String& text) { |
54 DCHECK(CalledOnValidThread()); | 55 DCHECK(CalledOnValidThread()); |
55 ui::ScopedClipboardWriter writer(ui::CLIPBOARD_TYPE_COPY_PASTE); | 56 ui::ScopedClipboardWriter writer(ui::CLIPBOARD_TYPE_COPY_PASTE); |
56 writer.WriteText(ConvertMojoStringToString16(text)); | 57 writer.WriteText(ConvertMojoStringToString16(text)); |
57 } | 58 } |
58 | 59 |
59 void ArcClipboardBridge::GetTextContent() { | 60 void ArcClipboardBridge::GetTextContent() { |
60 DCHECK(CalledOnValidThread()); | 61 DCHECK(CalledOnValidThread()); |
61 | 62 |
62 base::string16 text; | 63 base::string16 text; |
63 ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); | 64 ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); |
64 clipboard->ReadText(ui::CLIPBOARD_TYPE_COPY_PASTE, &text); | 65 clipboard->ReadText(ui::CLIPBOARD_TYPE_COPY_PASTE, &text); |
65 | 66 |
66 ClipboardInstance* clipboard_instance = bridge_service_->clipboard_instance(); | 67 ClipboardInstance* clipboard_instance = |
| 68 arc_bridge_service()->clipboard_instance(); |
67 clipboard_instance->OnGetTextContent(ConvertString16ToMojoString(text)); | 69 clipboard_instance->OnGetTextContent(ConvertString16ToMojoString(text)); |
68 } | 70 } |
69 | 71 |
70 bool ArcClipboardBridge::CalledOnValidThread() { | 72 bool ArcClipboardBridge::CalledOnValidThread() { |
71 // Make sure access to the Chrome clipboard is happening in the UI thread. | 73 // Make sure access to the Chrome clipboard is happening in the UI thread. |
72 return thread_checker_.CalledOnValidThread(); | 74 return thread_checker_.CalledOnValidThread(); |
73 } | 75 } |
74 | 76 |
75 } // namespace arc | 77 } // namespace arc |
OLD | NEW |