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

Side by Side Diff: components/mus/clipboard/clipboard_impl.cc

Issue 2047703003: Revert of Implement ui::ClipboardMus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/mus/clipboard/clipboard_impl.h" 5 #include "components/mus/clipboard/clipboard_impl.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "mojo/common/common_type_converters.h"
12 #include "mojo/public/cpp/bindings/array.h" 11 #include "mojo/public/cpp/bindings/array.h"
13 #include "mojo/public/cpp/bindings/callback.h" 12 #include "mojo/public/cpp/bindings/callback.h"
14 #include "mojo/public/cpp/bindings/string.h" 13 #include "mojo/public/cpp/bindings/string.h"
15 14
16 using mojo::Array; 15 using mojo::Array;
17 using mojo::Map; 16 using mojo::Map;
18 using mojo::String; 17 using mojo::String;
19 18
20 namespace mus { 19 namespace mus {
21 namespace clipboard { 20 namespace clipboard {
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 } 77 }
79 78
80 void ClipboardImpl::GetAvailableMimeTypes( 79 void ClipboardImpl::GetAvailableMimeTypes(
81 Clipboard::Type clipboard_type, 80 Clipboard::Type clipboard_type,
82 const GetAvailableMimeTypesCallback& callback) { 81 const GetAvailableMimeTypesCallback& callback) {
83 int clipboard_num = static_cast<int>(clipboard_type); 82 int clipboard_num = static_cast<int>(clipboard_type);
84 callback.Run(clipboard_state_[clipboard_num]->sequence_number(), 83 callback.Run(clipboard_state_[clipboard_num]->sequence_number(),
85 clipboard_state_[clipboard_num]->GetMimeTypes()); 84 clipboard_state_[clipboard_num]->GetMimeTypes());
86 } 85 }
87 86
88 void ClipboardImpl::ReadClipboardData( 87 void ClipboardImpl::ReadMimeType(
88 uint64_t sequence,
89 Clipboard::Type clipboard_type, 89 Clipboard::Type clipboard_type,
90 const String& mime_type, 90 const String& mime_type,
91 const ReadClipboardDataCallback& callback) { 91 const ReadMimeTypeCallback& callback) {
92 int clipboard_num = static_cast<int>(clipboard_type); 92 int clipboard_num = static_cast<int>(clipboard_type);
93 Array<uint8_t> mime_data(nullptr); 93 Array<uint8_t> mime_data(nullptr);
94 uint64_t sequence = clipboard_state_[clipboard_num]->sequence_number(); 94 bool valid_sequence_number =
95 clipboard_state_[clipboard_num]->GetData(mime_type, &mime_data); 95 clipboard_state_[clipboard_num]->sequence_number() == sequence;
96 callback.Run(sequence, std::move(mime_data)); 96
97 if (valid_sequence_number)
98 clipboard_state_[clipboard_num]->GetData(mime_type, &mime_data);
99
100 callback.Run(valid_sequence_number, std::move(mime_data));
97 } 101 }
98 102
99 void ClipboardImpl::WriteClipboardData( 103 void ClipboardImpl::WriteClipboardData(
100 Clipboard::Type clipboard_type, 104 Clipboard::Type clipboard_type,
101 Map<String, Array<uint8_t>> data, 105 Map<String, Array<uint8_t>> data,
102 const WriteClipboardDataCallback& callback) { 106 const WriteClipboardDataCallback& callback) {
103 int clipboard_num = static_cast<int>(clipboard_type); 107 int clipboard_num = static_cast<int>(clipboard_type);
104 clipboard_state_[clipboard_num]->SetData(std::move(data)); 108 clipboard_state_[clipboard_num]->SetData(std::move(data));
105 callback.Run(clipboard_state_[clipboard_num]->sequence_number()); 109 callback.Run(clipboard_state_[clipboard_num]->sequence_number());
106 } 110 }
107 111
108 } // namespace clipboard 112 } // namespace clipboard
109 } // namespace mus 113 } // namespace mus
OLDNEW
« no previous file with comments | « components/mus/clipboard/clipboard_impl.h ('k') | components/mus/clipboard/clipboard_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698