| 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 974fa1b5bc88f711a18e9af038fc8bc65c3a2535..4562bf0486bcb58d259447452202ab060d62ab63 100644
|
| --- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
|
| +++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
|
| @@ -21,7 +21,7 @@ const int kMaxBitmapSize = 256;
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // FaviconRawBitmapHandler fetchs all bitmaps with the 'icon' (or 'shortcut
|
| -// icon') link tag, storing the one that best matches ash::SHELF_SIZE. These
|
| +// icon') link tag, storing the one that best matches ash::kShelfSize. These
|
| // icon bitmaps are not resized and are not cached beyond the lifetime of the
|
| // class. Bitmaps larger than kMaxBitmapSize are ignored.
|
|
|
| @@ -144,7 +144,7 @@ void FaviconRawBitmapHandler::AddFavicon(const GURL& image_url,
|
| if (new_bitmap.height() > kMaxBitmapSize ||
|
| new_bitmap.width() > kMaxBitmapSize)
|
| return;
|
| - if (new_bitmap.height() < ash::GetShelfConstant(ash::SHELF_SIZE))
|
| + if (new_bitmap.height() < ash::kShelfSize)
|
| return;
|
| if (!bitmap_.isNull()) {
|
| // We want the smallest icon that is large enough.
|
|
|