Download and store large favicon for Android.

chrome/browser/favicon/favicon_handler.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/favicon/favicon_handler.h"
 
 #include "build/build_config.h"
 
 #include <algorithm>
 #include <vector>
@@ skipping 14 matching lines @@
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_util.h"
 
 using content::FaviconURL;
 using content::NavigationEntry;
 
 namespace {
 
 // Size (along each axis) of a touch icon. This currently corresponds to
 // the apple touch icon for iPad.
-const int kTouchIconSize = 72;
+const int kTouchIconSize = 144;
 
 // Returns chrome::IconType the given icon_type corresponds to.
 chrome::IconType ToHistoryIconType(FaviconURL::IconType icon_type) {
   switch (icon_type) {
     case FaviconURL::FAVICON:
       return chrome::FAVICON;
     case FaviconURL::TOUCH_ICON:
       return chrome::TOUCH_ICON;
     case FaviconURL::TOUCH_PRECOMPOSED_ICON:
       return chrome::TOUCH_PRECOMPOSED_ICON;
     case FaviconURL::INVALID_ICON:
       return chrome::INVALID_ICON;
   }
   NOTREACHED();
-  // Shouldn't reach here, just make compiler happy.
   return chrome::INVALID_ICON;
 }
 
 // Get the maximal icon size in pixels for a icon of type |icon_type| for the
 // current platform.
 int GetMaximalIconSize(chrome::IconType icon_type) {
-  int base_size = 0;
   switch (icon_type) {
     case chrome::FAVICON:
-      base_size = gfx::kFaviconSize;
-      break;
+#if defined(OS_ANDROID)
+      return 192;
+#else
+      return gfx::ImageSkia::GetMaxSupportedScale() * gfx::kFaviconSize;
+#endif
     case chrome::TOUCH_ICON:
     case chrome::TOUCH_PRECOMPOSED_ICON:
-      base_size = kTouchIconSize;
-      break;
+      return kTouchIconSize;
     case chrome::INVALID_ICON:
-      base_size = 0;
-      break;
+      return 0;
   }
-  return gfx::ImageSkia::GetMaxSupportedScale() * base_size;
+  NOTREACHED();
+  return 0;
 }
 
 bool DoUrlAndIconMatch(const FaviconURL& favicon_url,
                        const GURL& url,
                        chrome::IconType icon_type) {
   return favicon_url.icon_url == url &&
       favicon_url.icon_type == static_cast<FaviconURL::IconType>(icon_type);
 }
 
 // Returns true if all of the icon URLs and icon types in |bitmap_results| are
@@ skipping 546 matching lines @@
       GetMaximalIconSize(icon_type));
   if (download_id) {
     // Download ids should be unique.
     DCHECK(download_requests_.find(download_id) == download_requests_.end());
     download_requests_[download_id] =
         DownloadRequest(url, image_url, icon_type);
   }
 
   return download_id;
 }