| 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 1024346c283c0016122d9d2dd789b046b34a27b2..b36a0ab6ac474c30930c5c8c913087894a118bb4 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::GetShelfLayoutConstant(ash::SHELF_SIZE))
 | 
|      return;
 | 
|    if (!bitmap_.isNull()) {
 | 
|      // We want the smallest icon that is large enough.
 | 
| 
 |