Rename best icon to best primary icon in Web app related code.

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_array.h"
@@ skipping 28 matching lines @@
 
 int g_default_rgb_icon_value = 145;
 
 // Retrieves and caches the ideal and minimum sizes of the Home screen icon
 // and the splash screen image.
 void GetHomescreenIconAndSplashImageSizes() {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jintArray> java_size_array =
       Java_ShortcutHelper_getHomeScreenIconAndSplashImageSizes(env);
   std::vector<int> sizes;
-  base::android::JavaIntArrayToIntVector(
-      env, java_size_array.obj(), &sizes);
+  base::android::JavaIntArrayToIntVector(env, java_size_array.obj(), &sizes);
 
   // Check that the size returned is what is expected.
   DCHECK(sizes.size() == 5);
 
   // This ordering must be kept up to date with the Java ShortcutHelper.
   g_ideal_homescreen_icon_size = sizes[0];
   g_minimum_homescreen_icon_size = sizes[1];
   g_ideal_splash_image_size = sizes[2];
   g_minimum_splash_image_size = sizes[3];
   g_ideal_badge_icon_size = sizes[4];
 
   // Try to ensure that the data returned is sane.
   DCHECK(g_minimum_homescreen_icon_size <= g_ideal_homescreen_icon_size);
   DCHECK(g_minimum_splash_image_size <= g_ideal_splash_image_size);
 }
 
-} // anonymous namespace
+}  // anonymous namespace
 
 // static
 void ShortcutHelper::AddToLauncherWithSkBitmap(
     content::BrowserContext* browser_context,
     const ShortcutInfo& info,
     const std::string& webapp_id,
     const SkBitmap& icon_bitmap,
     const base::Closure& splash_image_callback) {
   if (info.display == blink::WebDisplayModeStandalone ||
       info.display == blink::WebDisplayModeFullscreen) {
@@ skipping 26 matching lines @@
   ScopedJavaLocalRef<jstring> java_url =
       base::android::ConvertUTF8ToJavaString(env, info.url.spec());
   ScopedJavaLocalRef<jstring> java_scope_url =
       base::android::ConvertUTF8ToJavaString(env, info.scope.spec());
   ScopedJavaLocalRef<jstring> java_user_title =
       base::android::ConvertUTF16ToJavaString(env, info.user_title);
   ScopedJavaLocalRef<jstring> java_name =
       base::android::ConvertUTF16ToJavaString(env, info.name);
   ScopedJavaLocalRef<jstring> java_short_name =
       base::android::ConvertUTF16ToJavaString(env, info.short_name);
-  ScopedJavaLocalRef<jstring> java_best_icon_url =
-      base::android::ConvertUTF8ToJavaString(env, info.best_icon_url.spec());
+  ScopedJavaLocalRef<jstring> java_best_primary_icon_url =
+      base::android::ConvertUTF8ToJavaString(env,
+                                             info.best_primary_icon_url.spec());
   ScopedJavaLocalRef<jobject> java_bitmap;
   if (icon_bitmap.getSize())
     java_bitmap = gfx::ConvertToJavaBitmap(&icon_bitmap);
 
   // The callback will need to be run after shortcut creation completes in order
   // to download the splash image and save it to the WebappDataStorage. Create a
   // copy of the callback here and send the pointer to Java, which will send it
   // back once the asynchronous shortcut creation process finishes.
   uintptr_t callback_pointer =
       reinterpret_cast<uintptr_t>(new base::Closure(splash_image_callback));
 
-  Java_ShortcutHelper_addWebapp(env, java_webapp_id, java_url, java_scope_url,
-                                java_user_title, java_name, java_short_name,
-                                java_best_icon_url, java_bitmap, info.display,
-                                info.orientation, info.source, info.theme_color,
-                                info.background_color, callback_pointer);
+  Java_ShortcutHelper_addWebapp(
+      env, java_webapp_id, java_url, java_scope_url, java_user_title, java_name,
+      java_short_name, java_best_primary_icon_url, java_bitmap, info.display,
+      info.orientation, info.source, info.theme_color, info.background_color,
+      callback_pointer);
 }
 
-void ShortcutHelper::AddShortcutWithSkBitmap(
-    const ShortcutInfo& info,
-    const SkBitmap& icon_bitmap) {
+void ShortcutHelper::AddShortcutWithSkBitmap(const ShortcutInfo& info,
+                                             const SkBitmap& icon_bitmap) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_url =
       base::android::ConvertUTF8ToJavaString(env, info.url.spec());
   ScopedJavaLocalRef<jstring> java_user_title =
       base::android::ConvertUTF16ToJavaString(env, info.user_title);
   ScopedJavaLocalRef<jobject> java_bitmap;
   if (icon_bitmap.getSize())
     java_bitmap = gfx::ConvertToJavaBitmap(&icon_bitmap);
 
   Java_ShortcutHelper_addShortcut(env, java_url, java_user_title, java_bitmap,
@@ skipping 44 matching lines @@
     const std::string& webapp_id) {
   // This is a fire and forget task. It is not vital for the splash screen image
   // to be downloaded so if the downloader returns false there is no fallback.
   ManifestIconDownloader::Download(
       web_contents, image_url, ideal_splash_image_size_in_px,
       minimum_splash_image_size_in_px,
       base::Bind(&ShortcutHelper::StoreWebappSplashImage, webapp_id));
 }
 
 // static
-void ShortcutHelper::StoreWebappSplashImage(
-    const std::string& webapp_id,
-    const SkBitmap& splash_image) {
+void ShortcutHelper::StoreWebappSplashImage(const std::string& webapp_id,
+                                            const SkBitmap& splash_image) {
   if (splash_image.drawsNothing())
     return;
 
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_webapp_id =
       base::android::ConvertUTF8ToJavaString(env, webapp_id);
   ScopedJavaLocalRef<jobject> java_splash_image =
       gfx::ConvertToJavaBitmap(&splash_image);
 
   Java_ShortcutHelper_storeWebappSplashImage(env, java_webapp_id,
@@ skipping 45 matching lines @@
 // static
 std::string ShortcutHelper::QueryWebApkPackage(const GURL& url) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_url =
       base::android::ConvertUTF8ToJavaString(env, url.spec());
   ScopedJavaLocalRef<jstring> java_webapk_package_name =
       Java_ShortcutHelper_queryWebApkPackage(env, java_url);
 
   std::string webapk_package_name = "";
   if (java_webapk_package_name.obj()) {
-    webapk_package_name = base::android::ConvertJavaStringToUTF8(
-        env, java_webapk_package_name);
+    webapk_package_name =
+        base::android::ConvertJavaStringToUTF8(env, java_webapk_package_name);
   }
   return webapk_package_name;
 }
 
 // static
-bool ShortcutHelper::IsWebApkInstalled(
-    content::BrowserContext* browser_context,
-    const GURL& start_url,
-    const GURL& manifest_url) {
+bool ShortcutHelper::IsWebApkInstalled(content::BrowserContext* browser_context,
+                                       const GURL& start_url,
+                                       const GURL& manifest_url) {
   return !QueryWebApkPackage(start_url).empty() ||
-      WebApkInstallService::Get(browser_context)
-      ->IsInstallInProgress(manifest_url);
+         WebApkInstallService::Get(browser_context)
+             ->IsInstallInProgress(manifest_url);
 }
 
 GURL ShortcutHelper::GetScopeFromURL(const GURL& url) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> java_url =
       base::android::ConvertUTF8ToJavaString(env, url.spec());
   ScopedJavaLocalRef<jstring> java_scope_url =
       Java_ShortcutHelper_getScopeFromUrl(env, java_url);
   return GURL(base::android::ConvertJavaStringToUTF16(env, java_scope_url));
 }
@@ skipping 11 matching lines @@
   DCHECK(jsplash_image_callback);
   base::Closure* splash_image_callback =
       reinterpret_cast<base::Closure*>(jsplash_image_callback);
   splash_image_callback->Run();
   delete splash_image_callback;
 }
 
 bool ShortcutHelper::RegisterShortcutHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }