Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(107)

Unified Diff: ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm

Issue 2608693002: Fix: Factor iOS native image loading into a utility function. (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm
diff --git a/ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm b/ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm
index 421e2cda3842c7829b2f5af16e854e08b2e161d4..84adea1713b824939d1baac28267bf0f4fbb3371 100644
--- a/ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm
+++ b/ios/chrome/browser/ui/tools_menu/tools_menu_view_controller.mm
@@ -359,8 +359,10 @@ NS_INLINE void AnimateInViews(NSArray* views,
ToolsMenuButton* button = [[ToolsMenuButton alloc] initWithFrame:CGRectZero];
[button setTranslatesAutoresizingMaskIntoConstraints:NO];
- [button setImage:NativeReversableImage(imageIds[0][0], reverseForRTL)
- forState:UIControlStateNormal];
+ if (imageIds[0][0]) {
+ [button setImage:NativeReversableImage(imageIds[0][0], reverseForRTL)
+ forState:UIControlStateNormal];
+ }
[[button imageView] setContentMode:UIViewContentModeCenter];
[button setBackgroundColor:[self backgroundColor]];
[button setTag:commandID];
@@ -368,14 +370,20 @@ NS_INLINE void AnimateInViews(NSArray* views,
SetA11yLabelAndUiAutomationName(button, labelID, name);
- UIImage* pressedImage = NativeReversableImage(imageIds[0][1], reverseForRTL);
- if (pressedImage) {
- [button setImage:pressedImage forState:UIControlStateHighlighted];
+ if (imageIds[0][1]) {
+ UIImage* pressedImage =
+ NativeReversableImage(imageIds[0][1], reverseForRTL);
+ if (pressedImage) {
+ [button setImage:pressedImage forState:UIControlStateHighlighted];
+ }
}
- UIImage* disabledImage = NativeReversableImage(imageIds[0][2], reverseForRTL);
- if (disabledImage) {
- [button setImage:disabledImage forState:UIControlStateDisabled];
+ if (imageIds[0][2]) {
+ UIImage* disabledImage =
+ NativeReversableImage(imageIds[0][2], reverseForRTL);
+ if (disabledImage) {
+ [button setImage:disabledImage forState:UIControlStateDisabled];
+ }
}
return button;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698