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

Unified Diff: chrome/browser/ui/views/tab_icon_view.cc

Issue 6693021: fav icon -> favicon. Pass 5: fav_icon -> favicon (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
Index: chrome/browser/ui/views/tab_icon_view.cc
diff --git a/chrome/browser/ui/views/tab_icon_view.cc b/chrome/browser/ui/views/tab_icon_view.cc
index 8b2e094a726ff6d1ccbc8896173c49acc0746a24..511af61e72dec9dcf5d016bbdcc867cb7e192045 100644
--- a/chrome/browser/ui/views/tab_icon_view.cc
+++ b/chrome/browser/ui/views/tab_icon_view.cc
@@ -25,7 +25,7 @@
#endif
static bool g_initialized = false;
-static SkBitmap* g_default_fav_icon = NULL;
+static SkBitmap* g_default_favicon = NULL;
// static
void TabIconView::InitializeIfNeeded() {
@@ -36,11 +36,11 @@ void TabIconView::InitializeIfNeeded() {
// The default window icon is the application icon, not the default
// favicon.
HICON app_icon = GetAppIcon();
- g_default_fav_icon =
+ g_default_favicon =
IconUtil::CreateSkBitmapFromHICON(app_icon, gfx::Size(16, 16));
DestroyIcon(app_icon);
#else
- g_default_fav_icon =
+ g_default_favicon =
ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_PRODUCT_LOGO_16);
#endif
}
@@ -147,7 +147,7 @@ void TabIconView::OnPaint(gfx::Canvas* canvas) {
}
if (!rendered)
- PaintFavIcon(canvas, *g_default_fav_icon);
+ PaintFavIcon(canvas, *g_default_favicon);
}
gfx::Size TabIconView::GetPreferredSize() {
« no previous file with comments | « chrome/browser/ui/views/create_application_shortcut_view.cc ('k') | chrome/browser/ui/views/tabs/base_tab.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698