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

Unified Diff: components/html_viewer/web_clipboard_impl.cc

Issue 1142043005: Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix type conversion errors on win64 for some msvs Created 5 years, 7 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
« no previous file with comments | « components/filesystem/files_test_base.cc ('k') | components/html_viewer/web_cookie_jar_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/web_clipboard_impl.cc
diff --git a/components/html_viewer/web_clipboard_impl.cc b/components/html_viewer/web_clipboard_impl.cc
index 8810c3d0ab4b3a3913dc7dcd50af7983a1b669b3..0641a936696b990515242b6522ca1b06a801d016 100644
--- a/components/html_viewer/web_clipboard_impl.cc
+++ b/components/html_viewer/web_clipboard_impl.cc
@@ -69,7 +69,7 @@ uint64_t WebClipboardImpl::sequenceNumber(Buffer buffer) {
base::Bind(&CopyUint64, &number));
// Force this to be synchronous.
- clipboard_.WaitForIncomingMethodCall();
+ clipboard_.WaitForIncomingResponse();
return number;
}
@@ -81,7 +81,7 @@ bool WebClipboardImpl::isFormatAvailable(Format format, Buffer buffer) {
clipboard_type, base::Bind(&CopyVectorString, &types));
// Force this to be synchronous.
- clipboard_.WaitForIncomingMethodCall();
+ clipboard_.WaitForIncomingResponse();
switch (format) {
case FormatPlainText:
@@ -108,7 +108,7 @@ blink::WebVector<blink::WebString> WebClipboardImpl::readAvailableTypes(
clipboard_type, base::Bind(&CopyVectorString, &types));
// Force this to be synchronous.
- clipboard_.WaitForIncomingMethodCall();
+ clipboard_.WaitForIncomingResponse();
// AFAICT, every instance of setting contains_filenames is false.
*contains_filenames = false;
@@ -129,7 +129,7 @@ blink::WebString WebClipboardImpl::readPlainText(Buffer buffer) {
base::Bind(&CopyWebString, &text));
// Force this to be synchronous.
- clipboard_.WaitForIncomingMethodCall();
+ clipboard_.WaitForIncomingResponse();
return text;
}
@@ -143,14 +143,14 @@ blink::WebString WebClipboardImpl::readHTML(Buffer buffer,
blink::WebString html;
clipboard_->ReadMimeType(type, Clipboard::MIME_TYPE_HTML,
base::Bind(&CopyWebString, &html));
- clipboard_.WaitForIncomingMethodCall();
+ clipboard_.WaitForIncomingResponse();
*fragment_start = 0;
*fragment_end = static_cast<unsigned>(html.length());
clipboard_->ReadMimeType(type, Clipboard::MIME_TYPE_URL,
base::Bind(&CopyURL, page_url));
- clipboard_.WaitForIncomingMethodCall();
+ clipboard_.WaitForIncomingResponse();
return html;
}
@@ -165,7 +165,7 @@ blink::WebString WebClipboardImpl::readCustomData(
clipboard_type, mime_type.utf8(), base::Bind(&CopyWebString, &data));
// Force this to be synchronous.
- clipboard_.WaitForIncomingMethodCall();
+ clipboard_.WaitForIncomingResponse();
return data;
}
« no previous file with comments | « components/filesystem/files_test_base.cc ('k') | components/html_viewer/web_cookie_jar_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698