Clean up some ash constants.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/launcher/launcher_favicon_loader.h"
 
 #include "ash/shelf/shelf_constants.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "url/gurl.h"
 
 namespace internal {
 
 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.
 
 class FaviconRawBitmapHandler : public content::WebContentsObserver {
  public:
   FaviconRawBitmapHandler(content::WebContents* web_contents,
                           LauncherFaviconLoader::Delegate* delegate)
       : content::WebContentsObserver(web_contents),
         delegate_(delegate),
         weak_ptr_factory_(this) {}
@@ skipping 102 matching lines @@
   if (!bitmaps.empty())
     AddFavicon(image_url, bitmaps[0]);
 }
 
 void FaviconRawBitmapHandler::AddFavicon(const GURL& image_url,
                                          const SkBitmap& new_bitmap) {
   processed_requests_.insert(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.
     if (new_bitmap.height() > bitmap_.height())
       return;
   }
   bitmap_url_ = image_url;
   bitmap_ = new_bitmap;
   delegate_->FaviconUpdated();
 }
@@ skipping 12 matching lines @@
 LauncherFaviconLoader::~LauncherFaviconLoader() {
 }
 
 SkBitmap LauncherFaviconLoader::GetFavicon() const {
   return favicon_handler_->bitmap();
 }
 
 bool LauncherFaviconLoader::HasPendingDownloads() const {
   return favicon_handler_->HasPendingDownloads();
 }