Show scheme in black and content in gray for data: protocol urls

ios/chrome/browser/ui/omnibox/omnibox_view_ios.mm

Index: ios/chrome/browser/ui/omnibox/omnibox_view_ios.mm
diff --git a/ios/chrome/browser/ui/omnibox/omnibox_view_ios.mm b/ios/chrome/browser/ui/omnibox/omnibox_view_ios.mm
index 31e498d8240a2cce529dc33574e15174768db959..7529bd299e09c56e36703602f80ab9848fb22708 100644
--- a/ios/chrome/browser/ui/omnibox/omnibox_view_ios.mm
+++ b/ios/chrome/browser/ui/omnibox/omnibox_view_ios.mm
@@ -50,11 +50,6 @@ UIColor* ErrorTextColor() {
   return skia::UIColorFromSkColor(gfx::kGoogleRed700);
 }
 
-// The color of the https when there is a warning.
-UIColor* WarningTextColor() {
-  return skia::UIColorFromSkColor(gfx::kGoogleYellow700);
-}
-
 // The color of the https when there is not an error.
 UIColor* SecureTextColor() {
   return skia::UIColorFromSkColor(gfx::kGoogleGreen700);
@@ -65,13 +60,6 @@ UIColor* IncognitoSecureTextColor() {
   return [UIColor colorWithWhite:(255 / 255.0) alpha:1.0];
 }
 
-// Helper to make converting url_parse ranges to NSRange easier to
-// read.
-NSRange ComponentToNSRange(const url::Component& component) {
-  return NSMakeRange(static_cast<NSInteger>(component.begin),
-                     static_cast<NSInteger>(component.len));
-}
-
 }  // namespace
 
 // Simple Obj-C object to forward UITextFieldDelegate method calls back to the
@@ -185,7 +173,8 @@ OmniboxViewIOS::OmniboxViewIOS(OmniboxTextFieldIOS* field,
       field_([field retain]),
       controller_(controller),
       preloader_(preloader),
-      ignore_popup_updates_(false) {
+      ignore_popup_updates_(false),
+      attributing_display_string_(nil) {
   popup_view_.reset(new OmniboxPopupViewIOS(this, model(), positioner));
   field_delegate_.reset(
       [[AutocompleteTextFieldDelegate alloc] initWithEditView:this]);
@@ -634,61 +623,74 @@ void OmniboxViewIOS::WillPaste() {
   model()->OnPaste();
 }
 
+// static
+UIColor* OmniboxViewIOS::GetSecureTextColor(
+    security_state::SecurityLevel security_level,
+    bool in_dark_mode) {
+  if (security_level == security_state::EV_SECURE ||
+      security_level == security_state::SECURE) {
+    return in_dark_mode ? IncognitoSecureTextColor() : SecureTextColor();
+  }
+
+  // Don't color strikethrough in dark mode. See https://crbug.com/635004#c6
+  if (security_level == security_state::DANGEROUS && !in_dark_mode)
+    return ErrorTextColor();
+
+  return nil;
+}
+
+void OmniboxViewIOS::SetEmphasis(bool emphasize, const gfx::Range& range) {
+  NSRange ns_range = range.IsValid()
+                         ? range.ToNSRange()
+                         : NSMakeRange(0, [attributing_display_string_ length]);

[rohitrao (ping after 24h), 2017/03/03 21:53:51]

If the range is invalid, we emphasize everything instead of emphasizing nothing?
 Is this the behavior on other platforms too?

[elawrence, 2017/03/03 22:01:59]

Yes, if the range is invalid, we apply the color (black when |emphasize| is
true, or grey when it's false) to the entire string.

Yes, this matches other platforms, although the exact mechanism differs. On
Views::View, SetColor() is used to set the color for the full text, while
ApplyColor(range) is used to set the color only for a partial range of the text.


In practice, I believe SetColor and ApplyColor(0,length) works out to be the
same thing, but that's how this code worked before I got there.

+
+  [attributing_display_string_
+      addAttribute:NSForegroundColorAttributeName
+             value:(emphasize) ? [field_ displayedTextColor] : BaseTextColor()
+             range:ns_range];
+}
+
+void OmniboxViewIOS::UpdateSchemeStyle(const gfx::Range& range) {
+  if (!range.IsValid())
+    return;
+
+  const security_state::SecurityLevel security_level =
+      controller()->GetToolbarModel()->GetSecurityLevel(false);
+
+  if ((security_level == security_state::NONE) ||
+      (security_level == security_state::HTTP_SHOW_WARNING)) {
+    return;
+  }
+
+  DCHECK_NE(security_state::SECURITY_WARNING, security_level);
+  DCHECK_NE(security_state::SECURE_WITH_POLICY_INSTALLED_CERT, security_level);
+
+  if (security_level == security_state::DANGEROUS) {
+    // Add a strikethrough through the scheme.
+    [attributing_display_string_
+        addAttribute:NSStrikethroughStyleAttributeName
+               value:[NSNumber numberWithInteger:NSUnderlineStyleSingle]
+               range:range.ToNSRange()];
+  }
+
+  UIColor* color = GetSecureTextColor(security_level, [field_ incognito]);
+  if (color) {
+    [attributing_display_string_ addAttribute:NSForegroundColorAttributeName
+                                        value:color
+                                        range:range.ToNSRange()];
+  }
+}
+
 NSAttributedString* OmniboxViewIOS::ApplyTextAttributes(
     const base::string16& text) {
   NSMutableAttributedString* as = [[[NSMutableAttributedString alloc]
       initWithString:base::SysUTF16ToNSString(text)] autorelease];
-  url::Component scheme, host;
-  AutocompleteInput::ParseForEmphasizeComponents(
-      text, AutocompleteSchemeClassifierImpl(), &scheme, &host);
-
-  const bool emphasize = model()->CurrentTextIsURL() && (host.len > 0);
-  if (emphasize) {
-    [as addAttribute:NSForegroundColorAttributeName
-               value:BaseTextColor()
-               range:NSMakeRange(0, [as length])];
-
-    [as addAttribute:NSForegroundColorAttributeName
-               value:[field_ displayedTextColor]
-               range:ComponentToNSRange(host)];
-
-    if (scheme.len > 0) {
-      UIColor* color = nil;
-      switch (controller_->GetToolbarModel()->GetSecurityLevel(false)) {
-        case security_state::NONE:
-        case security_state::HTTP_SHOW_WARNING:
-          break;
-        case security_state::SECURITY_WARNING:
-          // Don't color strikethrough schemes. See https://crbug.com/635004#c6
-          if (![field_ incognito])
-            color = WarningTextColor();
-          [as addAttribute:NSStrikethroughStyleAttributeName
-                     value:[NSNumber numberWithInteger:NSUnderlineStyleSingle]
-                     range:ComponentToNSRange(scheme)];
-          break;
-        case security_state::SECURE:
-        case security_state::EV_SECURE:
-          color = [field_ incognito] ? IncognitoSecureTextColor()
-                                     : SecureTextColor();
-          break;
-        case security_state::DANGEROUS:
-          // Don't color strikethrough schemes. See https://crbug.com/635004#c6
-          if (![field_ incognito])
-            color = ErrorTextColor();
-          [as addAttribute:NSStrikethroughStyleAttributeName
-                     value:[NSNumber numberWithInteger:NSUnderlineStyleSingle]
-                     range:ComponentToNSRange(scheme)];
-          break;
-        case security_state::SECURE_WITH_POLICY_INSTALLED_CERT:
-          NOTREACHED();
-      }
-      if (color) {
-        [as addAttribute:NSForegroundColorAttributeName
-                   value:color
-                   range:ComponentToNSRange(scheme)];
-      }
-    }
-  }
+  // Cache a pointer to the attributed string to allow the superclass'
+  // virtual method invocations to add attributes.
+  DCHECK(attributing_display_string_ == nil);
+  base::AutoReset<NSMutableAttributedString*> resetter(
+      &attributing_display_string_, as);
+  UpdateTextStyle(text, AutocompleteSchemeClassifierImpl());
   return as;
 }