diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 14:43:43 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 14:43:43 +0000 |
| commit | f23a8c18ba3ef2d366479f6b94021d75b49e9e37 (patch) | |
| tree | 4c45941d3c294be6d6121ac2dabd4101bb80e5fe /views | |
| parent | 9b488bda307fc224779706660915e8ac25d0eb8a (diff) | |
| download | chromium_src-f23a8c18ba3ef2d366479f6b94021d75b49e9e37.zip chromium_src-f23a8c18ba3ef2d366479f6b94021d75b49e9e37.tar.gz chromium_src-f23a8c18ba3ef2d366479f6b94021d75b49e9e37.tar.bz2 | |
fav icon -> favicon. Pass 3: kFavIconSize -> kFaviconSize
BUG=76073
TEST=none; no visible change
Review URL: http://codereview.chromium.org/6681041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78209 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/menu/menu_item_view_gtk.cc | 4 | ||||
| -rw-r--r-- | views/controls/table/native_table_win.cc | 2 | ||||
| -rw-r--r-- | views/controls/table/table_view.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/views/controls/menu/menu_item_view_gtk.cc b/views/controls/menu/menu_item_view_gtk.cc index 5991b9e..3c35a95 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(), diff --git a/views/controls/table/native_table_win.cc b/views/controls/table/native_table_win.cc index fd7fb4b..aba9027 100644 --- a/views/controls/table/native_table_win.cc +++ b/views/controls/table/native_table_win.cc @@ -537,7 +537,7 @@ LRESULT NativeTableWin::OnCustomDraw(NMLVCUSTOMDRAW* draw_info) { // view when they are 16x16 so we get an extra pixel of padding). canvas.DrawBitmapInt(image, 0, 0, image.width(), image.height(), - 1, 1, kFavIconSize, kFavIconSize, true); + 1, 1, kFaviconSize, kFaviconSize, true); // Only paint the visible region of the icon. RECT to_draw = { intersection.left - icon_rect.left, diff --git a/views/controls/table/table_view.cc b/views/controls/table/table_view.cc index 59f5d62..fa2817f 100644 --- a/views/controls/table/table_view.cc +++ b/views/controls/table/table_view.cc @@ -1262,7 +1262,7 @@ LRESULT TableView::OnCustomDraw(NMLVCUSTOMDRAW* draw_info) { // view when they are 16x16 so we get an extra pixel of padding). canvas.DrawBitmapInt(image, 0, 0, image.width(), image.height(), - 1, 1, kFavIconSize, kFavIconSize, true); + 1, 1, kFaviconSize, kFaviconSize, true); // Only paint the visible region of the icon. RECT to_draw = { intersection.left - icon_rect.left, |