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

Unified Diff: chrome/browser/ui/webui/ntp/favicon_webui_handler.cc

Issue 330603004: Rename FaviconBitmapXxx to FaviconRawBitmapXxx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix android Created 6 years, 6 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/browser/ui/webui/ntp/favicon_webui_handler.h ('k') | components/favicon_base/favicon_callback.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
index f5773dfb1de7ee09d8b13836479418663d97755e..0b3b5b2553e4b7b3da8645db3eea095e95627234 100644
--- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
+++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc
@@ -111,8 +111,8 @@ void FaviconWebUIHandler::HandleGetFaviconDominantColor(
}
dom_id_map_[id_] = dom_id;
- favicon_service->GetRawFaviconForURL(
- FaviconService::FaviconForURLParams(
+ favicon_service->GetRawFaviconForPageURL(
+ FaviconService::FaviconForPageURLParams(
url, favicon_base::FAVICON, gfx::kFaviconSize),
ui::SCALE_FACTOR_100P,
base::Bind(&FaviconWebUIHandler::OnFaviconDataAvailable,
@@ -123,7 +123,7 @@ void FaviconWebUIHandler::HandleGetFaviconDominantColor(
void FaviconWebUIHandler::OnFaviconDataAvailable(
int id,
- const favicon_base::FaviconBitmapResult& bitmap_result) {
+ const favicon_base::FaviconRawBitmapResult& bitmap_result) {
scoped_ptr<base::StringValue> color_value;
if (bitmap_result.is_valid())
« no previous file with comments | « chrome/browser/ui/webui/ntp/favicon_webui_handler.h ('k') | components/favicon_base/favicon_callback.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698