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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 1017853002: [Icons NTP] Allow chrome-search:// large-icon and fallback-icon hosts to use <view_id>/<restricted_… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « no previous file | chrome/renderer/searchbox/searchbox.h » ('j') | chrome/renderer/searchbox/searchbox.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 3daf11327c4033207c387c59ca2667e16e6613e1..68b0e3d46c8afb61ccedd3ae93fdd07204a4e6b3 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -1380,8 +1380,12 @@ bool ChromeContentRendererClient::WillSendRequest(
if (search_box && url.SchemeIs(chrome::kChromeSearchScheme)) {
if (url.host() == chrome::kChromeUIThumbnailHost)
return search_box->GenerateThumbnailURLFromTransientURL(url, new_url);
- else if (url.host() == chrome::kChromeUIFaviconHost)
+ if (url.host() == chrome::kChromeUIFaviconHost)
James Hawkins 2015/03/17 21:46:41 Shouldn't these all be else if since the hosts are
huangs 2015/03/18 21:43:10 I thought you don't need else if returning?
return search_box->GenerateFaviconURLFromTransientURL(url, new_url);
+ if (url.host() == chrome::kChromeUILargeIconHost)
+ return search_box->GenerateLargeIconURLFromTransientURL(url, new_url);
+ if (url.host() == chrome::kChromeUIFallbackIconHost)
+ return search_box->GenerateFallbackIconURLFromTransientURL(url, new_url);
}
return false;
« no previous file with comments | « no previous file | chrome/renderer/searchbox/searchbox.h » ('j') | chrome/renderer/searchbox/searchbox.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698