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

Unified Diff: chrome/browser/favicon/favicon_handler.h

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/extensions/extension_web_ui.cc ('k') | chrome/browser/favicon/favicon_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/favicon/favicon_handler.h
diff --git a/chrome/browser/favicon/favicon_handler.h b/chrome/browser/favicon/favicon_handler.h
index 68903f6ed0a9f1c27ee25b4b0dbcbabbfdd07eb9..b4feadcf45fc584d09ae28f70b42cedd6d161831 100644
--- a/chrome/browser/favicon/favicon_handler.h
+++ b/chrome/browser/favicon/favicon_handler.h
@@ -191,7 +191,7 @@ class FaviconHandler {
// See description above class for details.
void OnFaviconDataForInitialURLFromFaviconService(const std::vector<
- favicon_base::FaviconBitmapResult>& favicon_bitmap_results);
+ favicon_base::FaviconRawBitmapResult>& favicon_bitmap_results);
// If the favicon has expired, asks the renderer to download the favicon.
// Otherwise asks history to update the mapping between page url and icon
@@ -201,7 +201,7 @@ class FaviconHandler {
favicon_base::IconType icon_type);
// See description above class for details.
- void OnFaviconData(const std::vector<favicon_base::FaviconBitmapResult>&
+ void OnFaviconData(const std::vector<favicon_base::FaviconRawBitmapResult>&
favicon_bitmap_results);
// Schedules a download for the specified entry. This adds the request to
@@ -225,7 +225,7 @@ class FaviconHandler {
// Sets the favicon's data.
void SetFaviconOnActivePage(const std::vector<
- favicon_base::FaviconBitmapResult>& favicon_bitmap_results);
+ favicon_base::FaviconRawBitmapResult>& favicon_bitmap_results);
void SetFaviconOnActivePage(const GURL& icon_url, const gfx::Image& image);
// Return the current candidate if any.
@@ -277,8 +277,8 @@ class FaviconHandler {
// The prioritized favicon candidates from the page back from the renderer.
std::vector<favicon::FaviconURL> image_urls_;
- // The FaviconBitmapResults from history.
- std::vector<favicon_base::FaviconBitmapResult> history_results_;
+ // The FaviconRawBitmapResults from history.
+ std::vector<favicon_base::FaviconRawBitmapResult> history_results_;
// The client which implements embedder-specific Favicon operations.
FaviconClient* client_; // weak
« no previous file with comments | « chrome/browser/extensions/extension_web_ui.cc ('k') | chrome/browser/favicon/favicon_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698