| 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/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" | 
|   11 #include "mojo/public/cpp/bindings/array.h" |   12 #include "mojo/public/cpp/bindings/array.h" | 
|   12 #include "mojo/public/cpp/bindings/callback.h" |   13 #include "mojo/public/cpp/bindings/callback.h" | 
|   13 #include "mojo/public/cpp/bindings/string.h" |   14 #include "mojo/public/cpp/bindings/string.h" | 
|   14  |   15  | 
|   15 using mojo::Array; |   16 using mojo::Array; | 
|   16 using mojo::Map; |   17 using mojo::Map; | 
|   17 using mojo::String; |   18 using mojo::String; | 
|   18  |   19  | 
|   19 namespace mus { |   20 namespace mus { | 
|   20 namespace clipboard { |   21 namespace clipboard { | 
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   77 } |   78 } | 
|   78  |   79  | 
|   79 void ClipboardImpl::GetAvailableMimeTypes( |   80 void ClipboardImpl::GetAvailableMimeTypes( | 
|   80     Clipboard::Type clipboard_type, |   81     Clipboard::Type clipboard_type, | 
|   81     const GetAvailableMimeTypesCallback& callback) { |   82     const GetAvailableMimeTypesCallback& callback) { | 
|   82   int clipboard_num = static_cast<int>(clipboard_type); |   83   int clipboard_num = static_cast<int>(clipboard_type); | 
|   83   callback.Run(clipboard_state_[clipboard_num]->sequence_number(), |   84   callback.Run(clipboard_state_[clipboard_num]->sequence_number(), | 
|   84                clipboard_state_[clipboard_num]->GetMimeTypes()); |   85                clipboard_state_[clipboard_num]->GetMimeTypes()); | 
|   85 } |   86 } | 
|   86  |   87  | 
|   87 void ClipboardImpl::ReadMimeType( |   88 void ClipboardImpl::ReadClipboardData( | 
|   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 ReadMimeTypeCallback& callback) { |   91     const ReadClipboardDataCallback& 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   bool valid_sequence_number = |   94   uint64_t sequence = clipboard_state_[clipboard_num]->sequence_number(); | 
|   95       clipboard_state_[clipboard_num]->sequence_number() == sequence; |   95   clipboard_state_[clipboard_num]->GetData(mime_type, &mime_data); | 
|   96  |   96   callback.Run(sequence, std::move(mime_data)); | 
|   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)); |  | 
|  101 } |   97 } | 
|  102  |   98  | 
|  103 void ClipboardImpl::WriteClipboardData( |   99 void ClipboardImpl::WriteClipboardData( | 
|  104     Clipboard::Type clipboard_type, |  100     Clipboard::Type clipboard_type, | 
|  105     Map<String, Array<uint8_t>> data, |  101     Map<String, Array<uint8_t>> data, | 
|  106     const WriteClipboardDataCallback& callback) { |  102     const WriteClipboardDataCallback& callback) { | 
|  107   int clipboard_num = static_cast<int>(clipboard_type); |  103   int clipboard_num = static_cast<int>(clipboard_type); | 
|  108   clipboard_state_[clipboard_num]->SetData(std::move(data)); |  104   clipboard_state_[clipboard_num]->SetData(std::move(data)); | 
|  109   callback.Run(clipboard_state_[clipboard_num]->sequence_number()); |  105   callback.Run(clipboard_state_[clipboard_num]->sequence_number()); | 
|  110 } |  106 } | 
|  111  |  107  | 
|  112 }  // namespace clipboard |  108 }  // namespace clipboard | 
|  113 }  // namespace mus |  109 }  // namespace mus | 
| OLD | NEW |