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

Unified Diff: chrome/browser/search_engines/template_url.cc

Issue 6681041: fav icon -> favicon. Pass 3: kFavIconSize -> kFaviconSize (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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/browser/importer/importer.cc ('k') | chrome/browser/tab_contents/render_view_context_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/search_engines/template_url.cc
diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc
index 24c2f6b5250458b6124982dc4d4218287dfe2fca..ccdd59454cd98b6977f5a7cf6ec98d5c380cb618 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -654,7 +654,7 @@ void TemplateURL::SetFavIconURL(const GURL& url) {
for (std::vector<ImageRef>::iterator i = image_refs_.begin();
i != image_refs_.end(); ++i) {
if (i->type == "image/x-icon" &&
- i->width == kFavIconSize && i->height == kFavIconSize) {
+ i->width == kFaviconSize && i->height == kFaviconSize) {
if (!url.is_valid())
image_refs_.erase(i);
else
@@ -665,8 +665,8 @@ void TemplateURL::SetFavIconURL(const GURL& url) {
// Don't have one yet, add it.
if (url.is_valid()) {
add_image_ref(
- TemplateURL::ImageRef("image/x-icon", kFavIconSize,
- kFavIconSize, url));
+ TemplateURL::ImageRef("image/x-icon", kFaviconSize,
+ kFaviconSize, url));
}
}
@@ -674,7 +674,7 @@ GURL TemplateURL::GetFavIconURL() const {
for (std::vector<ImageRef>::const_iterator i = image_refs_.begin();
i != image_refs_.end(); ++i) {
if ((i->type == "image/x-icon" || i->type == "image/vnd.microsoft.icon")
- && i->width == kFavIconSize && i->height == kFavIconSize) {
+ && i->width == kFaviconSize && i->height == kFaviconSize) {
return i->url;
}
}
« no previous file with comments | « chrome/browser/importer/importer.cc ('k') | chrome/browser/tab_contents/render_view_context_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698