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

Side by Side Diff: mojo/services/clipboard/clipboard_standalone_impl.cc

Issue 611633002: mojom: Add associative arrays to the mojom language. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Suppress pylint warnings instead of making MapKind public. Created 6 years, 2 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 (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 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 "mojo/services/clipboard/clipboard_standalone_impl.h" 5 #include "mojo/services/clipboard/clipboard_standalone_impl.h"
6 6
7 #include <cstring>
8
7 namespace mojo { 9 namespace mojo {
8 10
9 typedef std::vector<uint8_t> ByteVector;
10
11 // ClipboardData contains data copied to the Clipboard for a variety of formats. 11 // ClipboardData contains data copied to the Clipboard for a variety of formats.
12 // It mostly just provides APIs to cleanly access and manipulate this data. 12 // It mostly just provides APIs to cleanly access and manipulate this data.
13 class ClipboardStandaloneImpl::ClipboardData { 13 class ClipboardStandaloneImpl::ClipboardData {
14 public: 14 public:
15 ClipboardData() {} 15 ClipboardData() {}
16 ~ClipboardData() {} 16 ~ClipboardData() {}
17 17
18 std::vector<std::string> GetMimeTypes() const { 18 Array<String> GetMimeTypes() const {
19 std::vector<std::string> types; 19 Array<String> types(data_types_.size());
20 for (std::map<std::string, ByteVector>::const_iterator it = 20 int i = 0;
21 data_types_.begin(); 21 for (auto it = data_types_.begin(); it != data_types_.end(); ++it, ++i) {
22 it != data_types_.end(); 22 types[i] = it.GetKey();
23 ++it) {
24 types.push_back(it->first);
25 } 23 }
26 24
27 return types; 25 return types.Pass();
28 } 26 }
29 27
30 void SetData(std::map<std::string, ByteVector>* data) { 28 void SetData(Map<String, Array<uint8_t>> data) { data_types_ = data.Pass(); }
31 std::swap(data_types_, *data);
32 }
33 29
34 bool GetData(const std::string& mime_type, ByteVector* data) const { 30 void GetData(const String& mime_type, mojo::Array<uint8_t>* data) const {
35 std::map<std::string, ByteVector>::const_iterator it = 31 auto it = data_types_.find(mime_type);
36 data_types_.find(mime_type); 32 if (it != data_types_.end())
37 if (it != data_types_.end()) { 33 *data = it.GetValue().Clone().Pass();
yzshen1 2014/10/08 21:58:33 nit: Pass() is not needed in this case. (here and
38 *data = it->second;
39 return true;
40 }
41
42 return false;
43 } 34 }
44 35
45 private: 36 private:
46 std::map<std::string, ByteVector> data_types_; 37 Map<String, Array<uint8_t>> data_types_;
47 38
48 DISALLOW_COPY_AND_ASSIGN(ClipboardData); 39 DISALLOW_COPY_AND_ASSIGN(ClipboardData);
49 }; 40 };
50 41
51 ClipboardStandaloneImpl::ClipboardStandaloneImpl() { 42 ClipboardStandaloneImpl::ClipboardStandaloneImpl() {
52 for (int i = 0; i < kNumClipboards; ++i) { 43 for (int i = 0; i < kNumClipboards; ++i) {
53 sequence_number_[i] = 0; 44 sequence_number_[i] = 0;
54 clipboard_state_[i].reset(new ClipboardData); 45 clipboard_state_[i].reset(new ClipboardData);
55 } 46 }
56 } 47 }
57 48
58 ClipboardStandaloneImpl::~ClipboardStandaloneImpl() { 49 ClipboardStandaloneImpl::~ClipboardStandaloneImpl() {
59 } 50 }
60 51
61 void ClipboardStandaloneImpl::GetSequenceNumber( 52 void ClipboardStandaloneImpl::GetSequenceNumber(
62 Clipboard::Type clipboard_type, 53 Clipboard::Type clipboard_type,
63 const mojo::Callback<void(uint64_t)>& callback) { 54 const mojo::Callback<void(uint64_t)>& callback) {
64 callback.Run(sequence_number_[clipboard_type]); 55 callback.Run(sequence_number_[clipboard_type]);
65 } 56 }
66 57
67 void ClipboardStandaloneImpl::GetAvailableMimeTypes( 58 void ClipboardStandaloneImpl::GetAvailableMimeTypes(
68 Clipboard::Type clipboard_type, 59 Clipboard::Type clipboard_type,
69 const mojo::Callback<void(mojo::Array<mojo::String>)>& callback) { 60 const mojo::Callback<void(mojo::Array<mojo::String>)>& callback) {
70 mojo::Array<mojo::String> types = mojo::Array<mojo::String>::From( 61 callback.Run(clipboard_state_[clipboard_type]->GetMimeTypes().Pass());
71 clipboard_state_[clipboard_type]->GetMimeTypes());
72 callback.Run(types.Pass());
73 } 62 }
74 63
75 void ClipboardStandaloneImpl::ReadMimeType( 64 void ClipboardStandaloneImpl::ReadMimeType(
76 Clipboard::Type clipboard_type, 65 Clipboard::Type clipboard_type,
77 const mojo::String& mime_type, 66 const mojo::String& mime_type,
78 const mojo::Callback<void(mojo::Array<uint8_t>)>& callback) { 67 const mojo::Callback<void(mojo::Array<uint8_t>)>& callback) {
79 ByteVector mime_data; 68 mojo::Array<uint8_t> mime_data;
80 if (clipboard_state_[clipboard_type]->GetData( 69 clipboard_state_[clipboard_type]->GetData(mime_type, &mime_data);
81 mime_type.To<std::string>(), &mime_data)) { 70 callback.Run(mime_data.Pass());
82 callback.Run(mojo::Array<uint8_t>::From(mime_data).Pass());
83 return;
84 }
85
86 callback.Run(mojo::Array<uint8_t>().Pass());
87 } 71 }
88 72
89 void ClipboardStandaloneImpl::WriteClipboardData( 73 void ClipboardStandaloneImpl::WriteClipboardData(
90 Clipboard::Type clipboard_type, 74 Clipboard::Type clipboard_type,
91 mojo::Array<MimeTypePairPtr> data) { 75 mojo::Map<mojo::String, mojo::Array<uint8_t>> data) {
92 std::map<std::string, ByteVector> mime_data;
93 for (size_t i = 0; i < data.size(); ++i)
94 mime_data[data[i]->mime_type] = data[i]->data;
95
96 sequence_number_[clipboard_type]++; 76 sequence_number_[clipboard_type]++;
97 clipboard_state_[clipboard_type]->SetData(&mime_data); 77 clipboard_state_[clipboard_type]->SetData(data.Pass());
98 } 78 }
99 79
100 } // namespace mojo 80 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698