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

Unified Diff: ios/chrome/browser/ui/icons/chrome_icon.mm

Issue 2590473002: Upstream Chrome on iOS source code [5/11]. (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 | « ios/chrome/browser/ui/icons/chrome_icon.h ('k') | ios/chrome/browser/ui/icons/chrome_icon_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/icons/chrome_icon.mm
diff --git a/ios/chrome/browser/ui/icons/chrome_icon.mm b/ios/chrome/browser/ui/icons/chrome_icon.mm
new file mode 100644
index 0000000000000000000000000000000000000000..822247cbd21c0787d454766c027136d517f2e72e
--- /dev/null
+++ b/ios/chrome/browser/ui/icons/chrome_icon.mm
@@ -0,0 +1,86 @@
+// Copyright 2016 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 "ios/chrome/browser/ui/icons/chrome_icon.h"
+
+#import <CoreGraphics/CoreGraphics.h>
+
+#include "base/logging.h"
+#import "base/mac/scoped_nsobject.h"
+#include "ios/chrome/grit/ios_strings.h"
+#include "ui/base/l10n/l10n_util_mac.h"
+
+namespace {
+
+NSString* AccessibilityLabelForIconNamed(NSString* name) {
+ if ([name isEqualToString:@"ic_arrow_back"])
+ return l10n_util::GetNSString(IDS_IOS_ICON_ARROW_BACK);
+ if ([name isEqualToString:@"ic_close"])
+ return l10n_util::GetNSString(IDS_IOS_ICON_CLOSE);
+ if ([name isEqualToString:@"ic_info"])
+ return l10n_util::GetNSString(IDS_IOS_ICON_INFO);
+ if ([name isEqualToString:@"ic_search"])
+ return l10n_util::GetNSString(IDS_IOS_ICON_SEARCH);
+ return nil;
+}
+
+UIImage* IconNamed(NSString* name) {
+ UIImage* image = [UIImage imageNamed:name];
+ DCHECK(image);
+ image.accessibilityIdentifier = name;
+ image.accessibilityLabel = AccessibilityLabelForIconNamed(name);
+ return image;
+}
+
+// Wraps -[UIImage imageFlippedForRightToLeftLayoutDirection] to also support
+// porting accessibility properties.
+// TODO(crbug.com/622543): remove this workaround if Apple fixes rdar://26962660
+UIImage* ImageFlippedForRightToLeftLayoutDirection(UIImage* image) {
+ UIImage* imageFlipped = [image imageFlippedForRightToLeftLayoutDirection];
+ imageFlipped.accessibilityIdentifier = image.accessibilityIdentifier;
+ imageFlipped.accessibilityLabel = image.accessibilityLabel;
+ return imageFlipped;
+}
+
+} // namespace
+
+@implementation ChromeIcon
+
++ (UIImage*)backIcon {
+ return ImageFlippedForRightToLeftLayoutDirection(IconNamed(@"ic_arrow_back"));
+}
+
++ (UIImage*)closeIcon {
+ return IconNamed(@"ic_close");
+}
+
++ (UIImage*)infoIcon {
+ return IconNamed(@"ic_info");
+}
+
++ (UIImage*)searchIcon {
+ return IconNamed(@"ic_search");
+}
+
++ (UIImage*)chevronIcon {
+ return ImageFlippedForRightToLeftLayoutDirection(
+ IconNamed(@"ic_chevron_right"));
+}
+
++ (UIBarButtonItem*)templateBarButtonItemWithImage:(UIImage*)image
+ target:(id)target
+ action:(SEL)action {
+ UIImage* templateImage =
+ [image imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+ base::scoped_nsobject<UIBarButtonItem> barButtonItem([[UIBarButtonItem alloc]
+ initWithImage:templateImage
+ style:UIBarButtonItemStylePlain
+ target:target
+ action:action]);
+ [barButtonItem setAccessibilityIdentifier:image.accessibilityIdentifier];
+ [barButtonItem setAccessibilityLabel:image.accessibilityLabel];
+ return barButtonItem.autorelease();
+}
+
+@end
« no previous file with comments | « ios/chrome/browser/ui/icons/chrome_icon.h ('k') | ios/chrome/browser/ui/icons/chrome_icon_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698