| 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 0f1eefd165f0c9df6d4d1c05e5fbaea81f3031cf..f66814c4b7b8beac850fe762c9fb16e0fd585d04 100644
|
| --- a/content/browser/web_contents/web_contents_impl.cc
|
| +++ b/content/browser/web_contents/web_contents_impl.cc
|
| @@ -155,11 +155,13 @@ const char kDotGoogleDotCom[] = ".google.com";
|
|
|
| static int StartDownload(content::RenderViewHost* rvh,
|
| const GURL& url,
|
| + bool is_favicon,
|
| int image_size) {
|
| static int g_next_favicon_download_id = 0;
|
| rvh->Send(new IconMsg_DownloadFavicon(rvh->GetRoutingID(),
|
| ++g_next_favicon_download_id,
|
| url,
|
| + is_favicon,
|
| image_size));
|
| return g_next_favicon_download_id;
|
| }
|
| @@ -2042,10 +2044,12 @@ void WebContentsImpl::DidEndColorChooser(int color_chooser_id) {
|
| color_chooser_ = NULL;
|
| }
|
|
|
| -int WebContentsImpl::DownloadFavicon(const GURL& url, int image_size,
|
| - const FaviconDownloadCallback& callback) {
|
| +int WebContentsImpl::DownloadFavicon(const GURL& url,
|
| + bool is_favicon,
|
| + int image_size,
|
| + const FaviconDownloadCallback& callback) {
|
| RenderViewHost* host = GetRenderViewHost();
|
| - int id = StartDownload(host, url, image_size);
|
| + int id = StartDownload(host, url, is_favicon, image_size);
|
| favicon_download_map_[id] = callback;
|
| return id;
|
| }
|
|
|