Commit 4f04cfa3 authored by stkhapugin@chromium.org's avatar stkhapugin@chromium.org Committed by Commit Bot

Use correct tint color for placeholder in non-incognito.

Use the correct color scheme instead of always using incognito color
scheme when setting the placeholder color.

Bug: 859553
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: If6146f5b9f0c0c16833d058e9a5b12534314a09b
Reviewed-on: https://chromium-review.googlesource.com/1126100Reviewed-by: default avatarElodie Banel <lod@chromium.org>
Commit-Queue: Stepan Khapugin <stkhapugin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#572601}
parent 1874b89f
......@@ -286,7 +286,7 @@ const CGFloat kFontSize = 17.0f;
[self updateAccessibility];
}
#pragma mark - UIAccessibilityContainer]
#pragma mark - UIAccessibilityContainer
- (NSArray*)accessibilityElements {
return self.accessibleElements;
......
......@@ -209,8 +209,10 @@ typedef NS_ENUM(int, TrailingButtonState) {
// Display a fake "placeholder".
NSString* placeholderString =
l10n_util::GetNSString(IDS_OMNIBOX_EMPTY_HINT);
UIColor* placeholderColor =
[LocationBarSteadyViewColorScheme incognitoScheme].placeholderColor;
LocationBarSteadyViewColorScheme* scheme =
self.incognito ? [LocationBarSteadyViewColorScheme incognitoScheme]
: [LocationBarSteadyViewColorScheme standardScheme];
UIColor* placeholderColor = scheme.placeholderColor;
self.locationBarSteadyView.locationLabel.attributedText = [
[NSAttributedString alloc]
initWithString:placeholderString
......
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