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

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 1010783002: [Icons NTP] Working prototype to fetch, store, and display big icons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tweaks and unit test fix. 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 | « chrome/common/favicon/fallback_icon_url_parser_unittest.cc ('k') | chrome/renderer/searchbox/searchbox.h » ('j') | no next file with comments »
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 81ea464e735361f2add5d4797209ca5b82e79abd..b95fe8faa4c661444f64d28eccb528487f676dab 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -1366,10 +1366,17 @@ bool ChromeContentRendererClient::WillSendRequest(
content::RenderView::FromWebView(frame->view());
SearchBox* search_box = SearchBox::Get(render_view);
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)
- return search_box->GenerateFaviconURLFromTransientURL(url, new_url);
+ SearchBox::ImageSourceType type = SearchBox::NONE;
+ if (url.host() == chrome::kChromeUIFaviconHost)
+ type = SearchBox::FAVICON;
+ else if (url.host() == chrome::kChromeUILargeIconHost)
+ type = SearchBox::LARGE_ICON;
+ else if (url.host() == chrome::kChromeUIFallbackIconHost)
+ type = SearchBox::FALLBACK_ICON;
+ else if (url.host() == chrome::kChromeUIThumbnailHost)
+ type = SearchBox::THUMB;
+ if (type != SearchBox::NONE)
+ return search_box->GenerateImageURLFromTransientURL(url, type, new_url);
}
return false;
« no previous file with comments | « chrome/common/favicon/fallback_icon_url_parser_unittest.cc ('k') | chrome/renderer/searchbox/searchbox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698