Adds the option of aligning the launcher to the left or right. There

chrome/browser/ui/views/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/views/ash/launcher/launcher_favicon_loader.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.h"
 #include "chrome/common/favicon_url.h"
 #include "chrome/common/icon_messages.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace internal {
 
 const int kMaxBitmapSize = 256;
 
 ////////////////////////////////////////////////////////////////////////////////
 // FaviconBitmapHandler fetchs all bitmaps with the 'icon' (or 'shortcut icon')
-// link tag, storing the one that best matches ash::kLauncherPreferredHeight.
+// link tag, storing the one that best matches ash::kLauncherPreferredSize.
 // These icon bitmaps are not resized and are not cached beyond the lifetime
 // of the class. Bitmaps larger than kMaxBitmapSize are ignored.
 
 class FaviconBitmapHandler {
  public:
   FaviconBitmapHandler(content::WebContents* web_contents,
                        LauncherFaviconLoader::Delegate* delegate)
       : web_contents_(web_contents),
         delegate_(delegate) {
   }
@@ skipping 94 matching lines @@
   if (!errored)
     AddFavicon(image_url, bitmap);
 }
 
 void FaviconBitmapHandler::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::kLauncherPreferredHeight)
+  if (new_bitmap.height() < ash::kLauncherPreferredSize)
     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 31 matching lines @@
     const std::vector<FaviconURL>& candidates) {
   favicon_handler_->OnUpdateFaviconURL(page_id, candidates);
 }
 
 void LauncherFaviconLoader::OnDidDownloadFavicon(int id,
                                                  const GURL& image_url,
                                                  bool errored,
                                                  const SkBitmap& bitmap) {
   favicon_handler_->OnDidDownloadFavicon(id, image_url, errored, bitmap);
 }