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

Unified Diff: content/renderer/render_view_impl.cc

Issue 634123002: DidStopLoadingIcons should account for remote main frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 9f42f03fc4174428ef5dd3b71a9ededc9ace26d1..7df9f89d6e0a9c41d0959cab828be108d2840ecd 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -4174,6 +4174,9 @@ void RenderViewImpl::DidStopLoadingIcons() {
if (TouchEnabled())
icon_types |= WebIconURL::TypeTouchPrecomposed | WebIconURL::TypeTouch;
+ if (webview()->mainFrame()->isWebRemoteFrame())
Charlie Reis 2014/10/08 19:18:38 This is probably the right thing long-term, right?
nasko 2014/10/13 16:55:50 Done.
+ return;
+
WebVector<WebIconURL> icon_urls =
webview()->mainFrame()->iconURLs(icon_types);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698