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

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2201763002: Switch on use_new_wrapper_types mode for content/common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments from kinuko Created 4 years, 4 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 | « content/browser/web_contents/web_contents_impl.h ('k') | content/browser/websockets/websocket_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 40ec7e7885a7bc4c13c8f7af8bf208428d02773a..dca75bd2875ef70bda6301deaa1805470a4c903d 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3091,7 +3091,7 @@ int WebContentsImpl::DownloadImage(
BrowserThread::UI, FROM_HERE,
base::Bind(&WebContentsImpl::OnDidDownloadImage,
weak_factory_.GetWeakPtr(), callback, download_id, url, 400,
- nullptr, nullptr));
+ std::vector<SkBitmap>(), std::vector<gfx::Size>()));
return download_id;
}
@@ -4976,12 +4976,9 @@ void WebContentsImpl::OnDidDownloadImage(
int id,
const GURL& image_url,
int32_t http_status_code,
- mojo::Array<SkBitmap> images,
- mojo::Array<gfx::Size> original_image_sizes) {
- const std::vector<SkBitmap> bitmaps = images.To<std::vector<SkBitmap>>();
-
- callback.Run(id, http_status_code, image_url, bitmaps,
- original_image_sizes.PassStorage());
+ const std::vector<SkBitmap>& images,
+ const std::vector<gfx::Size>& original_image_sizes) {
+ callback.Run(id, http_status_code, image_url, images, original_image_sizes);
}
void WebContentsImpl::OnDialogClosed(int render_process_id,
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/browser/websockets/websocket_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698