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