diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-24 16:49:59 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-24 16:49:59 +0000 |
| commit | 1bc3ef056eb9fd5bd5b8f479a7b839df5f7be8dd (patch) | |
| tree | 6696875095afa91e8159e6c8afb9c6c64516d639 /chrome/browser/extensions/api/downloads/downloads_api.cc | |
| parent | 0802253de60a80eddbe0d3627dda42747c9054cd (diff) | |
| download | chromium_src-1bc3ef056eb9fd5bd5b8f479a7b839df5f7be8dd.zip chromium_src-1bc3ef056eb9fd5bd5b8f479a7b839df5f7be8dd.tar.gz chromium_src-1bc3ef056eb9fd5bd5b8f479a7b839df5f7be8dd.tar.bz2 | |
Remove implicit conversion from SkBitmap to ImageSkia
BUG=154727
Test=None
R=rsesek
TBR=sky,jam
Review URL: https://chromiumcodereview.appspot.com/11099010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/downloads/downloads_api.cc')
| -rw-r--r-- | chrome/browser/extensions/api/downloads/downloads_api.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc index 5645a53..f33c1e1 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc @@ -51,6 +51,7 @@ #include "net/base/load_flags.h" #include "net/http/http_util.h" #include "net/url_request/url_request.h" +#include "third_party/skia/include/core/SkBitmap.h" using content::BrowserContext; using content::BrowserThread; @@ -265,7 +266,7 @@ void DownloadFileIconExtractorImpl::OnIconLoadComplete( DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); std::string url; if (icon) - url = web_ui_util::GetImageDataUrl(*icon->ToImageSkia()); + url = web_ui_util::GetBitmapDataUrl(icon->AsBitmap()); callback_.Run(url); } |