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

Unified Diff: views/controls/menu/menu_item_view_gtk.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 | « ui/gfx/favicon_size.h ('k') | views/controls/table/native_table_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/menu/menu_item_view_gtk.cc
diff --git a/views/controls/menu/menu_item_view_gtk.cc b/views/controls/menu/menu_item_view_gtk.cc
index 5991b9e56829462f0c9067a08af4172eb5bc5666..3c35a959f836e9c6219735b089f44e6c26850d9e 100644
--- a/views/controls/menu/menu_item_view_gtk.cc
+++ b/views/controls/menu/menu_item_view_gtk.cc
@@ -28,8 +28,8 @@ gfx::Size MenuItemView::CalculatePreferredSize() {
const gfx::Font& font = MenuConfig::instance().font;
// TODO(sky): this is a workaround until I figure out why font.height()
// isn't returning the right thing. We really only want to include
- // kFavIconSize if we're showing icons.
- int content_height = std::max(kFavIconSize, font.GetHeight());
+ // kFaviconSize if we're showing icons.
+ int content_height = std::max(kFaviconSize, font.GetHeight());
return gfx::Size(
font.GetStringWidth(title_) + label_start_ +
item_right_margin_ + GetChildPreferredWidth(),
« no previous file with comments | « ui/gfx/favicon_size.h ('k') | views/controls/table/native_table_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698