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