Commit 66a8edd1 authored by Rohit Rao's avatar Rohit Rao Committed by Commit Bot

[ios] Moves the popup menu shadow into //ios/chrome/browser/ui/resources.

This asset will be shared by both the popup menu and collections.

BUG=None
TEST=None

Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Id6c87412a3a4ebd5e7755058a67288fdcc035ced
Reviewed-on: https://chromium-review.googlesource.com/997156Reviewed-by: default avatarGauthier Ambard <gambard@chromium.org>
Commit-Queue: Rohit Rao <rohitrao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548460}
parent 720fbd2c
...@@ -65,7 +65,6 @@ source_set("popup_menu_ui") { ...@@ -65,7 +65,6 @@ source_set("popup_menu_ui") {
"resources:popup_menu_request_desktop_site", "resources:popup_menu_request_desktop_site",
"resources:popup_menu_request_mobile_site", "resources:popup_menu_request_mobile_site",
"resources:popup_menu_settings", "resources:popup_menu_settings",
"resources:popup_menu_shadow",
"resources:popup_menu_site_information", "resources:popup_menu_site_information",
"resources:popup_menu_stop", "resources:popup_menu_stop",
"//base", "//base",
...@@ -75,6 +74,7 @@ source_set("popup_menu_ui") { ...@@ -75,6 +74,7 @@ source_set("popup_menu_ui") {
"//ios/chrome/browser/ui/image_util", "//ios/chrome/browser/ui/image_util",
"//ios/chrome/browser/ui/popup_menu/cells", "//ios/chrome/browser/ui/popup_menu/cells",
"//ios/chrome/browser/ui/presenters", "//ios/chrome/browser/ui/presenters",
"//ios/chrome/browser/ui/resources:menu_shadow",
"//ios/chrome/browser/ui/table_view", "//ios/chrome/browser/ui/table_view",
"//ios/chrome/browser/ui/table_view:styler", "//ios/chrome/browser/ui/table_view:styler",
"//ios/chrome/browser/ui/util", "//ios/chrome/browser/ui/util",
......
...@@ -60,8 +60,8 @@ const CGFloat kBackgroundGreyScale = 0.98; ...@@ -60,8 +60,8 @@ const CGFloat kBackgroundGreyScale = 0.98;
_contentContainer.backgroundColor = _contentContainer.backgroundColor =
[UIColor colorWithWhite:kBackgroundGreyScale alpha:1]; [UIColor colorWithWhite:kBackgroundGreyScale alpha:1];
UIImageView* shadow = [[UIImageView alloc] UIImageView* shadow =
initWithImage:StretchableImageNamed(@"popup_menu_shadow")]; [[UIImageView alloc] initWithImage:StretchableImageNamed(@"menu_shadow")];
[_contentContainer addSubview:shadow]; [_contentContainer addSubview:shadow];
shadow.translatesAutoresizingMaskIntoConstraints = NO; shadow.translatesAutoresizingMaskIntoConstraints = NO;
AddSameConstraintsToSidesWithInsets( AddSameConstraintsToSidesWithInsets(
......
...@@ -58,15 +58,6 @@ imageset("popup_background") { ...@@ -58,15 +58,6 @@ imageset("popup_background") {
] ]
} }
imageset("popup_menu_shadow") {
sources = [
"popup_menu_shadow.imageset/Contents.json",
"popup_menu_shadow.imageset/popup_menu_shadow.png",
"popup_menu_shadow.imageset/popup_menu_shadow@2x.png",
"popup_menu_shadow.imageset/popup_menu_shadow@3x.png",
]
}
imageset("popup_menu_new_incognito_tab") { imageset("popup_menu_new_incognito_tab") {
sources = [ sources = [
"popup_menu_new_incognito_tab.imageset/Contents.json", "popup_menu_new_incognito_tab.imageset/Contents.json",
......
...@@ -61,3 +61,12 @@ imageset("keyboard_button") { ...@@ -61,3 +61,12 @@ imageset("keyboard_button") {
"keyboard_button.imageset/keyboard_button~ipad.png", "keyboard_button.imageset/keyboard_button~ipad.png",
] ]
} }
imageset("menu_shadow") {
sources = [
"menu_shadow.imageset/Contents.json",
"menu_shadow.imageset/menu_shadow.png",
"menu_shadow.imageset/menu_shadow@2x.png",
"menu_shadow.imageset/menu_shadow@3x.png",
]
}
...@@ -3,17 +3,17 @@ ...@@ -3,17 +3,17 @@
{ {
"idiom": "universal", "idiom": "universal",
"scale": "1x", "scale": "1x",
"filename": "popup_menu_shadow.png" "filename": "menu_shadow.png"
}, },
{ {
"idiom": "universal", "idiom": "universal",
"scale": "2x", "scale": "2x",
"filename": "popup_menu_shadow@2x.png" "filename": "menu_shadow@2x.png"
}, },
{ {
"idiom": "universal", "idiom": "universal",
"scale": "3x", "scale": "3x",
"filename": "popup_menu_shadow@3x.png" "filename": "menu_shadow@3x.png"
} }
], ],
"info": { "info": {
......
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