[ios] Use World Default Favicon for FaviconLoader

This will visualize the world default favicon for collections that use FaviconLoader.

Bug: 847795

Change-Id: I0d0b3cfacd79bcf0510bed3b98397cc00ee57c6d
Reviewed-on: https://chromium-review.googlesource.com/1089882Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Reviewed-by: edchin <edchin@chromium.org>
Reviewed-by: Sergio Collazos <sczs@chromium.org>
Commit-Queue: Chris Lu <thegreenfrog@chromium.org>
Cr-Commit-Position: refs/heads/master@{#565651}

ios/chrome/browser/favicon/favicon_loader.mm

@@ -13,6 +13,7 @@
 #include "components/favicon/core/large_icon_service.h"
 #include "components/favicon_base/fallback_icon_style.h"
 #include "components/favicon_base/favicon_callback.h"
+#include "ios/chrome/browser/experimental_flags.h"
 #import "ios/chrome/browser/ui/favicon/favicon_attributes.h"
 #include "skia/ext/skia_utils_ios.h"
 #include "url/gurl.h"
@@ -78,6 +79,10 @@ FaviconAttributes* FaviconLoader::FaviconForUrl(
       url, min_favicon_size, favicon_size_in_pixels,
       base::BindRepeating(favicon_block), &cancelable_task_tracker_);
 
+  if (experimental_flags::IsCollectionsUIRebootEnabled()) {
+    return [FaviconAttributes
+        attributesWithImage:[UIImage imageNamed:@"default_world_favicon"]];
+  }
   return [FaviconAttributes
       attributesWithImage:[UIImage imageNamed:@"default_favicon"]];
 }

ios/chrome/browser/ui/BUILD.gn

@@ -289,8 +289,6 @@ source_set("ui_internal") {
     ":ui",
     "resources:custom_row_voice",
     "resources:custom_row_voice_pressed",
-    "resources:default_favicon",
-    "resources:default_favicon_incognito",
     "resources:keyboard_bg_portrait_tablet",
     "resources:keyboard_button",
     "//base",

ios/chrome/browser/ui/favicon/BUILD.gn

@@ -11,6 +11,8 @@ source_set("favicon") {
   ]
   deps = [
     ":favicon_ui",
+    "resources:default_favicon",
+    "resources:default_world_favicon",
     "//base",
     "//components/favicon/core",
     "//components/favicon_base",

ios/chrome/browser/ui/favicon/resources/BUILD.gn

+# Copyright 2018 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.
+
+import("//build/config/ios/asset_catalog.gni")
+
+imageset("default_world_favicon") {
+  sources = [
+    "default_world_favicon.imageset/Contents.json",
+    "default_world_favicon.imageset/default_world_favicon.png",
+    "default_world_favicon.imageset/default_world_favicon@2x.png",
+    "default_world_favicon.imageset/default_world_favicon@3x.png",
+  ]
+}
+
+imageset("default_favicon") {
+  sources = [
+    "default_favicon.imageset/Contents.json",
+    "default_favicon.imageset/default_favicon.png",
+    "default_favicon.imageset/default_favicon@2x.png",
+    "default_favicon.imageset/default_favicon@3x.png",
+  ]
+}
+
+imageset("default_favicon_incognito") {
+  sources = [
+    "default_favicon_incognito.imageset/Contents.json",
+    "default_favicon_incognito.imageset/default_favicon_incognito.png",
+    "default_favicon_incognito.imageset/default_favicon_incognito@2x.png",
+    "default_favicon_incognito.imageset/default_favicon_incognito@3x.png",
+  ]
+}

ios/chrome/browser/ui/favicon/resources/default_world_favicon.imageset/Contents.json

+{
+    "images": [
+        {
+            "idiom": "universal",
+            "scale": "1x",
+            "filename": "default_world_favicon.png"
+        },
+        {
+            "idiom": "universal",
+            "scale": "2x",
+            "filename": "default_world_favicon@2x.png"
+        },
+        {
+            "idiom": "universal",
+            "scale": "3x",
+            "filename": "default_world_favicon@3x.png"
+        }
+    ],
+    "info": {
+        "version": 1,
+        "author": "xcode"
+    }
+}

ios/chrome/browser/ui/history_popup/BUILD.gn

@@ -16,6 +16,7 @@ source_set("history_popup") {
     "//base",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/favicon/resources:default_favicon",
     "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/popup_menu:popup_menu_ui",
     "//ios/chrome/browser/ui/util",

ios/chrome/browser/ui/popup_menu/cells/BUILD.gn

@@ -16,6 +16,7 @@ source_set("cells") {
   deps = [
     "//base",
     "//ios/chrome/browser/ui",
+    "//ios/chrome/browser/ui/favicon/resources:default_favicon",
     "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/reading_list:reading_list_ui",
     "//ios/chrome/browser/ui/table_view:styler",

ios/chrome/browser/ui/resources/BUILD.gn

@@ -22,24 +22,6 @@ imageset("keyboard_bg_portrait_tablet") {
   ]
 }
 
-imageset("default_favicon") {
-  sources = [
-    "default_favicon.imageset/Contents.json",
-    "default_favicon.imageset/default_favicon.png",
-    "default_favicon.imageset/default_favicon@2x.png",
-    "default_favicon.imageset/default_favicon@3x.png",
-  ]
-}
-
-imageset("default_favicon_incognito") {
-  sources = [
-    "default_favicon_incognito.imageset/Contents.json",
-    "default_favicon_incognito.imageset/default_favicon_incognito.png",
-    "default_favicon_incognito.imageset/default_favicon_incognito@2x.png",
-    "default_favicon_incognito.imageset/default_favicon_incognito@3x.png",
-  ]
-}
-
 imageset("custom_row_voice") {
   sources = [
     "custom_row_voice.imageset/Contents.json",

ios/chrome/browser/ui/stack_view/BUILD.gn

@@ -54,6 +54,7 @@ source_set("stack_view") {
     "//ios/chrome/browser/tabs",
     "//ios/chrome/browser/ui",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/favicon/resources:default_favicon",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/browser/ui/main:feature_flags",

ios/chrome/browser/ui/tabs/BUILD.gn

@@ -59,6 +59,8 @@ source_set("tabs") {
     "//ios/chrome/browser/ui/bubble",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/favicon/resources:default_favicon",
+    "//ios/chrome/browser/ui/favicon/resources:default_favicon_incognito",
     "//ios/chrome/browser/ui/fullscreen",
     "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/tabs/requirements",