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

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

Issue 2599673005: arc: Use GET_INTERFACE_FOR_METHOD macro (Closed)
Patch Set: Addressed feedback Created 3 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
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 "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/threading/thread_checker.h" 9 #include "base/threading/thread_checker.h"
10 #include "components/arc/arc_bridge_service.h" 10 #include "components/arc/arc_bridge_service.h"
11 #include "ui/base/clipboard/clipboard.h" 11 #include "ui/base/clipboard/clipboard.h"
12 #include "ui/base/clipboard/clipboard_types.h" 12 #include "ui/base/clipboard/clipboard_types.h"
13 #include "ui/base/clipboard/scoped_clipboard_writer.h" 13 #include "ui/base/clipboard/scoped_clipboard_writer.h"
14 14
15 namespace arc { 15 namespace arc {
16 16
17 ArcClipboardBridge::ArcClipboardBridge(ArcBridgeService* bridge_service) 17 ArcClipboardBridge::ArcClipboardBridge(ArcBridgeService* bridge_service)
18 : ArcService(bridge_service), binding_(this) { 18 : ArcService(bridge_service), binding_(this) {
19 arc_bridge_service()->clipboard()->AddObserver(this); 19 arc_bridge_service()->clipboard()->AddObserver(this);
20 } 20 }
21 21
22 ArcClipboardBridge::~ArcClipboardBridge() { 22 ArcClipboardBridge::~ArcClipboardBridge() {
23 DCHECK(CalledOnValidThread()); 23 DCHECK(CalledOnValidThread());
24 arc_bridge_service()->clipboard()->RemoveObserver(this); 24 arc_bridge_service()->clipboard()->RemoveObserver(this);
25 } 25 }
26 26
27 void ArcClipboardBridge::OnInstanceReady() { 27 void ArcClipboardBridge::OnInstanceReady() {
28 mojom::ClipboardInstance* clipboard_instance = 28 mojom::ClipboardInstance* clipboard_instance =
29 arc_bridge_service()->clipboard()->GetInstanceForMethod("Init"); 29 ARC_GET_INSTANCE_FOR_METHOD(arc_bridge_service()->clipboard(), Init);
30 DCHECK(clipboard_instance); 30 DCHECK(clipboard_instance);
31 clipboard_instance->Init(binding_.CreateInterfacePtrAndBind()); 31 clipboard_instance->Init(binding_.CreateInterfacePtrAndBind());
32 } 32 }
33 33
34 void ArcClipboardBridge::SetTextContent(const std::string& text) { 34 void ArcClipboardBridge::SetTextContent(const std::string& text) {
35 DCHECK(CalledOnValidThread()); 35 DCHECK(CalledOnValidThread());
36 ui::ScopedClipboardWriter writer(ui::CLIPBOARD_TYPE_COPY_PASTE); 36 ui::ScopedClipboardWriter writer(ui::CLIPBOARD_TYPE_COPY_PASTE);
37 writer.WriteText(base::UTF8ToUTF16(text)); 37 writer.WriteText(base::UTF8ToUTF16(text));
38 } 38 }
39 39
40 void ArcClipboardBridge::GetTextContent() { 40 void ArcClipboardBridge::GetTextContent() {
41 DCHECK(CalledOnValidThread()); 41 DCHECK(CalledOnValidThread());
42 42
43 base::string16 text; 43 base::string16 text;
44 ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread(); 44 ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
45 clipboard->ReadText(ui::CLIPBOARD_TYPE_COPY_PASTE, &text); 45 clipboard->ReadText(ui::CLIPBOARD_TYPE_COPY_PASTE, &text);
46 46
47 mojom::ClipboardInstance* clipboard_instance = 47 mojom::ClipboardInstance* clipboard_instance = ARC_GET_INSTANCE_FOR_METHOD(
48 arc_bridge_service()->clipboard()->GetInstanceForMethod( 48 arc_bridge_service()->clipboard(), OnGetTextContent);
49 "OnGetTextContent");
50 if (!clipboard_instance) 49 if (!clipboard_instance)
51 return; 50 return;
52 clipboard_instance->OnGetTextContent(base::UTF16ToUTF8(text)); 51 clipboard_instance->OnGetTextContent(base::UTF16ToUTF8(text));
53 } 52 }
54 53
55 bool ArcClipboardBridge::CalledOnValidThread() { 54 bool ArcClipboardBridge::CalledOnValidThread() {
56 // Make sure access to the Chrome clipboard is happening in the UI thread. 55 // Make sure access to the Chrome clipboard is happening in the UI thread.
57 return thread_checker_.CalledOnValidThread(); 56 return thread_checker_.CalledOnValidThread();
58 } 57 }
59 58
60 } // namespace arc 59 } // namespace arc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698