| Index: chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
|
| index 243a8e8b24826fca7b38cb42b65580887bbee2b1..7549eeda2e422e844481fa7e7227f95188fb06df 100644
|
| --- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
|
| +++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
|
| @@ -22,7 +22,8 @@ const int kMaxBitmapSize = 256;
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // FaviconRawBitmapHandler fetchs all bitmaps with the 'icon' (or 'shortcut
|
| // icon')
|
| -// link tag, storing the one that best matches ash::kShelfSize.
|
| +// link tag, storing the one that best matches
|
| +// ash::ShelfLayoutConstant::SHELF_SIZE.
|
| // These icon bitmaps are not resized and are not cached beyond the lifetime
|
| // of the class. Bitmaps larger than kMaxBitmapSize are ignored.
|
|
|
| @@ -145,7 +146,7 @@ void FaviconRawBitmapHandler::AddFavicon(const GURL& image_url,
|
| if (new_bitmap.height() > kMaxBitmapSize ||
|
| new_bitmap.width() > kMaxBitmapSize)
|
| return;
|
| - if (new_bitmap.height() < ash::kShelfSize)
|
| + if (new_bitmap.height() < ash::GetShelfConstant(ash::SHELF_SIZE))
|
| return;
|
| if (!bitmap_.isNull()) {
|
| // We want the smallest icon that is large enough.
|
|
|