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

Unified Diff: mojo/services/html_viewer/webclipboard_impl.cc

Issue 646773005: mojo: Switch the clipboard interface over to using map<>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: moar tests 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 side-by-side diff with in-line comments
Download patch
Index: mojo/services/html_viewer/webclipboard_impl.cc
diff --git a/mojo/services/html_viewer/webclipboard_impl.cc b/mojo/services/html_viewer/webclipboard_impl.cc
index 94b16ca71fadf4a6854b08fa98b2ff0bd30675d3..9b7ebff4acefd152de04d1c9ecd40127ec074e59 100644
--- a/mojo/services/html_viewer/webclipboard_impl.cc
+++ b/mojo/services/html_viewer/webclipboard_impl.cc
@@ -168,11 +168,8 @@ blink::WebString WebClipboardImpl::readCustomData(
}
void WebClipboardImpl::writePlainText(const blink::WebString& text) {
- Array<MimeTypePairPtr> data;
- MimeTypePairPtr text_data(MimeTypePair::New());
- text_data->mime_type = mojo::Clipboard::MIME_TYPE_TEXT;
- text_data->data = Array<uint8_t>::From(text).Pass();
- data.push_back(text_data.Pass());
+ Map<String, Array<uint8_t>> data;
+ data[mojo::Clipboard::MIME_TYPE_TEXT] = Array<uint8_t>::From(text);
clipboard_->WriteClipboardData(mojo::Clipboard::TYPE_COPY_PASTE, data.Pass());
}
@@ -181,28 +178,13 @@ void WebClipboardImpl::writeHTML(const blink::WebString& htmlText,
const blink::WebURL& url,
const blink::WebString& plainText,
bool writeSmartPaste) {
- Array<MimeTypePairPtr> data;
- MimeTypePairPtr text_data(MimeTypePair::New());
- text_data->mime_type = mojo::Clipboard::MIME_TYPE_TEXT;
- text_data->data = Array<uint8_t>::From(plainText).Pass();
- data.push_back(text_data.Pass());
-
- MimeTypePairPtr html_data(MimeTypePair::New());
- text_data->mime_type = mojo::Clipboard::MIME_TYPE_HTML;
- text_data->data = Array<uint8_t>::From(htmlText).Pass();
- data.push_back(html_data.Pass());
-
- MimeTypePairPtr url_data(MimeTypePair::New());
- url_data->mime_type = mojo::Clipboard::MIME_TYPE_URL;
- url_data->data = Array<uint8_t>::From(url.string()).Pass();
- data.push_back(url_data.Pass());
-
- if (writeSmartPaste) {
- MimeTypePairPtr smart_paste(MimeTypePair::New());
- url_data->mime_type = kMimeTypeWebkitSmartPaste;
- url_data->data = Array<uint8_t>::From(blink::WebString()).Pass();
- data.push_back(smart_paste.Pass());
- }
+ Map<String, Array<uint8_t>> data;
+ data[mojo::Clipboard::MIME_TYPE_TEXT] = Array<uint8_t>::From(plainText);
+ data[mojo::Clipboard::MIME_TYPE_HTML] = Array<uint8_t>::From(htmlText);
+ data[mojo::Clipboard::MIME_TYPE_URL] = Array<uint8_t>::From(url.string());
+
+ if (writeSmartPaste)
+ data[kMimeTypeWebkitSmartPaste] = Array<uint8_t>::From(blink::WebString());
clipboard_->WriteClipboardData(mojo::Clipboard::TYPE_COPY_PASTE, data.Pass());
}
« no previous file with comments | « mojo/services/clipboard/clipboard_standalone_unittest.cc ('k') | mojo/services/public/interfaces/clipboard/clipboard.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698