Revert of Shelf Cleanup (- binary files)

chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc

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 d1fc9536ca8efd831f0c3940d6022267e502f71a..895441ebc1a4d395ac07a123b4d27fe3df82ed49 100644
--- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
@@ -19,7 +19,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // FaviconBitmapHandler 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::kShelfPreferredSize.
 // These icon bitmaps are not resized and are not cached beyond the lifetime
 // of the class. Bitmaps larger than kMaxBitmapSize are ignored.
 
@@ -147,7 +147,7 @@
   if (new_bitmap.height() > kMaxBitmapSize ||
       new_bitmap.width() > kMaxBitmapSize)
     return;
-  if (new_bitmap.height() < ash::kShelfSize)
+  if (new_bitmap.height() < ash::kShelfPreferredSize)
     return;
   if (!bitmap_.isNull()) {
     // We want the smallest icon that is large enough.