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

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

Issue 12945007: Fix Notifications Icon loading. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch for landing Created 7 years, 9 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/common/icon_messages.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 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;
}
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/common/icon_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698