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

Side by Side Diff: components/arc/clipboard/arc_clipboard_bridge.cc

Issue 1635603002: Make use of CreateInterfacePtrAndBind() where appropriate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tweaks 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 unified diff | Download patch
« no previous file with comments | « components/arc/arc_bridge_service_impl.cc ('k') | components/arc/ime/arc_ime_ipc_host_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 28 matching lines...) Expand all
39 39
40 void ArcClipboardBridge::OnClipboardInstanceReady() { 40 void ArcClipboardBridge::OnClipboardInstanceReady() {
41 ClipboardInstance* clipboard_instance = 41 ClipboardInstance* clipboard_instance =
42 arc_bridge_service()->clipboard_instance(); 42 arc_bridge_service()->clipboard_instance();
43 if (!clipboard_instance) { 43 if (!clipboard_instance) {
44 LOG(ERROR) << "OnClipboardInstanceReady called, " 44 LOG(ERROR) << "OnClipboardInstanceReady called, "
45 << "but no clipboard instance found"; 45 << "but no clipboard instance found";
46 return; 46 return;
47 } 47 }
48 48
49 ClipboardHostPtr host; 49 clipboard_instance->Init(binding_.CreateInterfacePtrAndBind());
50 binding_.Bind(mojo::GetProxy(&host));
51 clipboard_instance->Init(std::move(host));
52 } 50 }
53 51
54 void ArcClipboardBridge::SetTextContent(const mojo::String& text) { 52 void ArcClipboardBridge::SetTextContent(const mojo::String& text) {
55 DCHECK(CalledOnValidThread()); 53 DCHECK(CalledOnValidThread());
56 ui::ScopedClipboardWriter writer(ui::CLIPBOARD_TYPE_COPY_PASTE); 54 ui::ScopedClipboardWriter writer(ui::CLIPBOARD_TYPE_COPY_PASTE);
57 writer.WriteText(ConvertMojoStringToString16(text)); 55 writer.WriteText(ConvertMojoStringToString16(text));
58 } 56 }
59 57
60 void ArcClipboardBridge::GetTextContent() { 58 void ArcClipboardBridge::GetTextContent() {
61 DCHECK(CalledOnValidThread()); 59 DCHECK(CalledOnValidThread());
62 60
63 base::string16 text; 61 base::string16 text;
64 ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); 62 ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
65 clipboard->ReadText(ui::CLIPBOARD_TYPE_COPY_PASTE, &text); 63 clipboard->ReadText(ui::CLIPBOARD_TYPE_COPY_PASTE, &text);
66 64
67 ClipboardInstance* clipboard_instance = 65 ClipboardInstance* clipboard_instance =
68 arc_bridge_service()->clipboard_instance(); 66 arc_bridge_service()->clipboard_instance();
69 clipboard_instance->OnGetTextContent(ConvertString16ToMojoString(text)); 67 clipboard_instance->OnGetTextContent(ConvertString16ToMojoString(text));
70 } 68 }
71 69
72 bool ArcClipboardBridge::CalledOnValidThread() { 70 bool ArcClipboardBridge::CalledOnValidThread() {
73 // Make sure access to the Chrome clipboard is happening in the UI thread. 71 // Make sure access to the Chrome clipboard is happening in the UI thread.
74 return thread_checker_.CalledOnValidThread(); 72 return thread_checker_.CalledOnValidThread();
75 } 73 }
76 74
77 } // namespace arc 75 } // namespace arc
OLDNEW
« no previous file with comments | « components/arc/arc_bridge_service_impl.cc ('k') | components/arc/ime/arc_ime_ipc_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698