Commit b2d55a54 authored by Jérôme Lebel's avatar Jérôme Lebel Committed by Commit Bot

[iOS] Moving default_world_favicon to ios/chrome/common/ui

default_world_favicon was duplicated in:
 + ios/chrome/credential_provider_extension/ui/resources/
 + ios/chrome/common/ui/resources/

This patch moves default_world_favicon.imageset to:
 + ios/chrome/common/ui/resources/

Change-Id: I997e35b4ee695b24c1b6ffbf66e97fc5e2131f33
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2308720
Auto-Submit: Jérôme Lebel <jlebel@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790385}
parent ca625808
...@@ -11,7 +11,6 @@ source_set("favicon") { ...@@ -11,7 +11,6 @@ source_set("favicon") {
] ]
deps = [ deps = [
"resources:default_favicon", "resources:default_favicon",
"resources:default_world_favicon",
"resources:default_world_favicon_incognito", "resources:default_world_favicon_incognito",
"resources:default_world_favicon_regular", "resources:default_world_favicon_regular",
"//base", "//base",
...@@ -20,6 +19,7 @@ source_set("favicon") { ...@@ -20,6 +19,7 @@ source_set("favicon") {
"//ios/chrome/browser/favicon", "//ios/chrome/browser/favicon",
"//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util",
"//ios/chrome/common/ui/favicon", "//ios/chrome/common/ui/favicon",
"//ios/chrome/common/ui/resources:default_world_favicon",
"//url", "//url",
] ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
......
...@@ -4,15 +4,6 @@ ...@@ -4,15 +4,6 @@
import("//build/config/ios/asset_catalog.gni") 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_world_favicon_incognito") { imageset("default_world_favicon_incognito") {
sources = [ sources = [
"default_world_favicon_incognito.imageset/Contents.json", "default_world_favicon_incognito.imageset/Contents.json",
......
...@@ -48,7 +48,6 @@ source_set("tabs") { ...@@ -48,7 +48,6 @@ source_set("tabs") {
"//ios/chrome/browser/ui/colors", "//ios/chrome/browser/ui/colors",
"//ios/chrome/browser/ui/commands", "//ios/chrome/browser/ui/commands",
"//ios/chrome/browser/ui/elements", "//ios/chrome/browser/ui/elements",
"//ios/chrome/browser/ui/favicon/resources:default_world_favicon",
"//ios/chrome/browser/ui/fullscreen", "//ios/chrome/browser/ui/fullscreen",
"//ios/chrome/browser/ui/fullscreen:feature_flags", "//ios/chrome/browser/ui/fullscreen:feature_flags",
"//ios/chrome/browser/ui/image_util", "//ios/chrome/browser/ui/image_util",
...@@ -64,6 +63,7 @@ source_set("tabs") { ...@@ -64,6 +63,7 @@ source_set("tabs") {
"//ios/chrome/common", "//ios/chrome/common",
"//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/colors",
"//ios/chrome/common/ui/elements", "//ios/chrome/common/ui/elements",
"//ios/chrome/common/ui/resources:default_world_favicon",
"//ios/chrome/common/ui/util", "//ios/chrome/common/ui/util",
"//ios/third_party/material_components_ios", "//ios/third_party/material_components_ios",
"//ios/web", "//ios/web",
......
# Copyright 2020 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",
]
}
...@@ -34,6 +34,7 @@ source_set("ui") { ...@@ -34,6 +34,7 @@ source_set("ui") {
"//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/colors",
"//ios/chrome/common/ui/confirmation_alert", "//ios/chrome/common/ui/confirmation_alert",
"//ios/chrome/common/ui/elements:popover_label_view_controller", "//ios/chrome/common/ui/elements:popover_label_view_controller",
"//ios/chrome/common/ui/resources:default_world_favicon",
"//ios/chrome/common/ui/util", "//ios/chrome/common/ui/util",
"//ios/chrome/credential_provider_extension:metrics_util", "//ios/chrome/credential_provider_extension:metrics_util",
"//ios/chrome/credential_provider_extension:password_util", "//ios/chrome/credential_provider_extension:password_util",
......
...@@ -8,7 +8,6 @@ import("//build/config/ios/rules.gni") ...@@ -8,7 +8,6 @@ import("//build/config/ios/rules.gni")
group("resources") { group("resources") {
deps = [ deps = [
":consent_illustration", ":consent_illustration",
":default_world_favicon",
":empty_credentials_illustration", ":empty_credentials_illustration",
":info_icon", ":info_icon",
":password_hide_icon", ":password_hide_icon",
...@@ -52,15 +51,6 @@ imageset("password_hide_icon") { ...@@ -52,15 +51,6 @@ imageset("password_hide_icon") {
] ]
} }
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("info_icon") { imageset("info_icon") {
sources = [ sources = [
"info_icon.imageset/Contents.json", "info_icon.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"
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment