Using largest favicon for shortcut when possible.

chrome/browser/android/shortcut_helper.cc

 // Copyright 2013 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/android/shortcut_helper.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/basictypes.h"
 #include "base/location.h"
 #include "base/strings/string16.h"
 #include "base/threading/worker_pool.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/common/cancelable_task_tracker.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "jni/ShortcutHelper_jni.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/color_analysis.h"
+#include "ui/gfx/favicon_size.h"
 #include "url/gurl.h"
 
 ShortcutBuilder::ShortcutBuilder(content::WebContents* web_contents,
-                                 const string16& title)
-    : shortcut_type_(BOOKMARK) {
+                                 const string16& title,
+                                 int launcher_large_icon_size)
+    : launcher_large_icon_size_(launcher_large_icon_size),
+      shortcut_type_(BOOKMARK) {
   Observe(web_contents);
   url_ = web_contents->GetURL();
   if (title.length() > 0)
     title_ = title;
   else
     title_ = web_contents->GetTitle();
 
   // Send a message to the renderer to retrieve information about the page.
   Send(new ChromeViewMsg_RetrieveWebappInformation(routing_id(), url_));
 }
@@ skipping 21 matching lines @@
     shortcut_type_ = APP_SHORTCUT_APPLE;
   } else if (is_apple_mobile_webapp_capable || is_mobile_webapp_capable) {
     shortcut_type_ = APP_SHORTCUT;
   } else {
     shortcut_type_ = BOOKMARK;
   }
 
   // Grab the best, largest icon we can find to represent this bookmark.
   // TODO(dfalcantara): Try combining with the new BookmarksHandler once its
   //                    rewrite is further along.
-  FaviconService::FaviconForURLParams favicon_params(
-      profile,
-      url_,
-      chrome::TOUCH_PRECOMPOSED_ICON | chrome::TOUCH_ICON | chrome::FAVICON,
-      0);
-
+  std::vector<int> icon_types;
+  icon_types.push_back(chrome::FAVICON);
+  icon_types.push_back(chrome::TOUCH_PRECOMPOSED_ICON | chrome::TOUCH_ICON);
   FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
       profile, Profile::EXPLICIT_ACCESS);
 
-  favicon_service->GetRawFaviconForURL(
-      favicon_params,
-      ui::SCALE_FACTOR_100P,
+  // Using favicon if its size is not smaller than platform required size,
+  // otherwise using the largest icon among all avaliable icons.
+  int threshold_to_get_any_largest_icon = launcher_large_icon_size_ - 1;
+  favicon_service->GetLargestRawFaviconForURL(profile, url_, icon_types,

[Yaron, 2013/10/25 18:50:17]

Can you add a test that triggers this?

[michaelbai, 2013/10/25 19:01:00]

There already unit test for HistoryBackend::GetLargestFaviconForURL(), From
FaviconService to HistoryBackend is just some callback. I think we don't need to
test that case.

See

https://codereview.chromium.org/26563004/


On 2013/10/25 18:50:17, Yaron wrote:

+      threshold_to_get_any_largest_icon,
       base::Bind(&ShortcutBuilder::FinishAddingShortcut,
                  base::Unretained(this)),
       &cancelable_task_tracker_);
 }
 
 void ShortcutBuilder::FinishAddingShortcut(
     const chrome::FaviconBitmapResult& bitmap_result) {
   base::WorkerPool::PostTask(
       FROM_HERE,
       base::Bind(&ShortcutHelper::AddShortcutInBackground,
@@ skipping 20 matching lines @@
 }
 
 void ShortcutBuilder::Destroy() {
   if (cancelable_task_tracker_.HasTrackedTasks()) {
     cancelable_task_tracker_.TryCancelAll();
   }
   delete this;
 }
 
 void ShortcutHelper::AddShortcut(content::WebContents* web_contents,
-                                 const string16& title) {
+                                 const string16& title,
+                                 int launcher_large_icon_size) {
   // The ShortcutBuilder deletes itself when it's done.
-  new ShortcutBuilder(web_contents, title);
+  new ShortcutBuilder(web_contents, title, launcher_large_icon_size);
 }
 
 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void ShortcutHelper::AddShortcutInBackground(
     const GURL& url,
     const string16& title,
     ShortcutBuilder::ShortcutType shortcut_type,
@@ skipping 57 matching lines @@
   }
 }
 
 // Adds a shortcut to the current URL to the Android home screen, firing
 // background tasks to pull all the data required.
 // Note that we don't actually care about the tab here -- we just want
 // its otherwise inaccessible WebContents.
 static void AddShortcut(JNIEnv* env,
                         jclass clazz,
                         jint tab_android_ptr,
-                        jstring title) {
+                        jstring title,
+                        jint launcher_large_icon_size) {
   TabAndroid* tab = reinterpret_cast<TabAndroid*>(tab_android_ptr);
   ShortcutHelper::AddShortcut(
       tab->web_contents(),
-      base::android::ConvertJavaStringToUTF16(env, title));
+      base::android::ConvertJavaStringToUTF16(env, title),
+      launcher_large_icon_size);
 }