Commit a23e237c authored by Javier Ernesto Flores Robles's avatar Javier Ernesto Flores Robles Committed by Commit Bot

[iOS][DarkMode] Move favicon background color to common

This color is also going to be used in popup menu.

Bug: 976645
Change-Id: I7259415ba23aa7bbad24a5eb79794da0a3100389
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1735377
Commit-Queue: Javier Ernesto Flores Robles <javierrobles@chromium.org>
Reviewed-by: default avatarSergio Collazos <sczs@chromium.org>
Reviewed-by: default avatarJavier Ernesto Flores Robles <javierrobles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#684278}
parent 548e8672
...@@ -46,7 +46,6 @@ source_set("cells") { ...@@ -46,7 +46,6 @@ source_set("cells") {
"resources:table_view_cell_chevron", "resources:table_view_cell_chevron",
"resources:table_view_cell_edit_icon", "resources:table_view_cell_edit_icon",
"resources:table_view_cell_favicon_background", "resources:table_view_cell_favicon_background",
"resources:table_view_favicon_background_color",
"//base", "//base",
"//base:i18n", "//base:i18n",
"//ios/chrome/app/strings", "//ios/chrome/app/strings",
......
...@@ -38,9 +38,3 @@ imageset("table_view_cell_edit_icon") { ...@@ -38,9 +38,3 @@ imageset("table_view_cell_edit_icon") {
"table_view_cell_edit_icon.imageset/table_view_cell_edit_icon@3x.png", "table_view_cell_edit_icon.imageset/table_view_cell_edit_icon@3x.png",
] ]
} }
colorset("table_view_favicon_background_color") {
sources = [
"table_view_favicon_background_color.colorset/Contents.json",
]
}
...@@ -150,7 +150,7 @@ const char kDefaultSupplementalURLTextDelimiter[] = "•"; ...@@ -150,7 +150,7 @@ const char kDefaultSupplementalURLTextDelimiter[] = "•";
_faviconContainerView = _faviconContainerView =
[[UIImageView alloc] initWithImage:containerBackground]; [[UIImageView alloc] initWithImage:containerBackground];
_faviconContainerView.tintColor = _faviconContainerView.tintColor =
[UIColor colorNamed:@"table_view_favicon_background_color"]; [UIColor colorNamed:kFaviconBackgroundColor];
_faviconView = [[FaviconView alloc] init]; _faviconView = [[FaviconView alloc] init];
_faviconView.contentMode = UIViewContentModeScaleAspectFit; _faviconView.contentMode = UIViewContentModeScaleAspectFit;
......
...@@ -11,6 +11,7 @@ group("resources") { ...@@ -11,6 +11,7 @@ group("resources") {
":blue_color", ":blue_color",
":blue_dark_color", ":blue_dark_color",
":disabled_tint_color", ":disabled_tint_color",
":favicon_background_color",
":green_color", ":green_color",
":green_dark_color", ":green_dark_color",
":mdc_ink_color", ":mdc_ink_color",
...@@ -60,6 +61,12 @@ colorset("disabled_tint_color") { ...@@ -60,6 +61,12 @@ colorset("disabled_tint_color") {
] ]
} }
colorset("favicon_background_color") {
sources = [
"favicon_background_color.colorset/Contents.json",
]
}
colorset("green_color") { colorset("green_color") {
sources = [ sources = [
"green_color.colorset/Contents.json", "green_color.colorset/Contents.json",
......
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
extern NSString* const kBackgroundColor; extern NSString* const kBackgroundColor;
extern NSString* const kDisabledTintColor; extern NSString* const kDisabledTintColor;
// Background color used in the rounded squares behind favicons.
extern NSString* const kFaviconBackgroundColor;
extern NSString* const kMDCInkColor; extern NSString* const kMDCInkColor;
extern NSString* const kScrimBackgroundColor; extern NSString* const kScrimBackgroundColor;
extern NSString* const kSolidButtonTextColor; extern NSString* const kSolidButtonTextColor;
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#pragma mark - Element Colors #pragma mark - Element Colors
NSString* const kBackgroundColor = @"background_color"; NSString* const kBackgroundColor = @"background_color";
NSString* const kDisabledTintColor = @"disabled_tint_color"; NSString* const kDisabledTintColor = @"disabled_tint_color";
NSString* const kFaviconBackgroundColor = @"favicon_background_color";
NSString* const kMDCInkColor = @"mdc_ink_color"; NSString* const kMDCInkColor = @"mdc_ink_color";
NSString* const kScrimBackgroundColor = @"scrim_background_color"; NSString* const kScrimBackgroundColor = @"scrim_background_color";
NSString* const kSolidButtonTextColor = @"solid_button_text_color"; NSString* const kSolidButtonTextColor = @"solid_button_text_color";
......
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