[Mac][Material Design] Correct location bar editing text colors.

chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
 #include "base/mac/foundation_util.h"
 #include "base/memory/ptr_util.h"
@@ skipping 68 matching lines @@
 NSColor* ColorWithRGBBytes(int rr, int gg, int bb) {
   DCHECK_LE(rr, 255);
   DCHECK_LE(bb, 255);
   DCHECK_LE(gg, 255);
   return [NSColor colorWithCalibratedRed:static_cast<float>(rr)/255.0
                                    green:static_cast<float>(gg)/255.0
                                     blue:static_cast<float>(bb)/255.0
                                    alpha:1.0];
 }
 
-NSColor* HostTextColor(bool inDarkMode) {
+NSColor* HostTextColor(bool in_dark_mode) {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return [NSColor blackColor];
   }
-  return inDarkMode ? [NSColor whiteColor] : [NSColor blackColor];
+  return in_dark_mode ? [NSColor whiteColor] : [NSColor blackColor];
 }
-NSColor* SecureSchemeColor(bool inDarkMode) {
+NSColor* SecureSchemeColor(bool in_dark_mode) {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return ColorWithRGBBytes(0x07, 0x95, 0x00);
   }
-  return inDarkMode ? [NSColor colorWithCalibratedWhite:1 alpha:0.5] :
-                      skia::SkColorToCalibratedNSColor(gfx::kGoogleGreen700);
+  return in_dark_mode ? [NSColor colorWithCalibratedWhite:1 alpha:0.5] :
+                        skia::SkColorToCalibratedNSColor(gfx::kGoogleGreen700);
 }
-NSColor* SecurityWarningSchemeColor(bool inDarkMode) {
-  return inDarkMode ? [NSColor colorWithCalibratedWhite:1 alpha:0.5] :
-                      skia::SkColorToCalibratedNSColor(gfx::kGoogleYellow700);
+NSColor* SecurityWarningSchemeColor(bool in_dark_mode) {
+  return in_dark_mode ? [NSColor colorWithCalibratedWhite:1 alpha:0.5] :
+                        skia::SkColorToCalibratedNSColor(gfx::kGoogleYellow700);
 }
-NSColor* SecurityErrorSchemeColor(bool inDarkMode) {
+NSColor* SecurityErrorSchemeColor(bool in_dark_mode) {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return ColorWithRGBBytes(0xa2, 0x00, 0x00);
   }
-  return inDarkMode ? [NSColor colorWithCalibratedWhite:1 alpha:0.5] :
-                      skia::SkColorToCalibratedNSColor(gfx::kGoogleRed700);
+  return in_dark_mode ? [NSColor colorWithCalibratedWhite:1 alpha:0.5] :
+                        skia::SkColorToCalibratedNSColor(gfx::kGoogleRed700);
 }
 
 const char kOmniboxViewMacStateKey[] = "OmniboxViewMacState";
 
 // Store's the model and view state across tab switches.
 struct OmniboxViewMacState : public base::SupportsUserData::Data {
   OmniboxViewMacState(const OmniboxEditModel::State model_state,
                       const bool has_focus,
                       const NSRange& selection)
       : model_state(model_state),
@@ skipping 416 matching lines @@
   [attributedString addAttribute:NSParagraphStyleAttributeName
                            value:paragraph_style
                            range:NSMakeRange(0, [attributedString length])];
 }
 
 void OmniboxViewMac::ApplyTextAttributes(
     const base::string16& display_text,
     NSMutableAttributedString* attributedString) {
   NSUInteger as_length = [attributedString length];
   NSRange as_entire_string = NSMakeRange(0, as_length);
-  bool inDarkMode = [[field_ window] inIncognitoModeWithSystemTheme];
+  bool in_dark_mode = [[field_ window] inIncognitoModeWithSystemTheme];
 
   ApplyTextStyle(attributedString);
 
   // A kinda hacky way to add breaking at periods. This is what Safari does.
   // This works for IDNs too, despite the "en_US".
   [attributedString addAttribute:@"NSLanguage"
                            value:@"en_US_POSIX"
                            range:as_entire_string];
 
+  // Under Material Design, force the text to be a single color white editing.
+  if (ui::MaterialDesignController::IsModeMaterial() &&
+      [field_ currentEditor]) {
+    if (as_length) {

[tapted, 2016/05/02 23:49:03]

nit: other places in this method don't check for an empty string - can this
extra check be omitted?

(Otherwise, I think it should be at the start of the method, like

  NSUInteger as_length = [attributedString length];
  if (as_length == 0)
    return;

)

[shrike, 2016/05/03 00:00:33]

The other blocks of code do check for an empty string, just not explicitly. The
problem is you don't want to addAttribute: on an empty attribute string,
otherwise you'll crash. I moved the check to the beginning.

+      [attributedString addAttribute:NSForegroundColorAttributeName
+                               value:HostTextColor(in_dark_mode)
+                               range:as_entire_string];
+    }
+    return;
+  }
+
   url::Component scheme, host;
   AutocompleteInput::ParseForEmphasizeComponents(
       display_text, ChromeAutocompleteSchemeClassifier(profile_), &scheme,
       &host);
   bool grey_out_url = display_text.substr(scheme.begin, scheme.len) ==
       base::UTF8ToUTF16(extensions::kExtensionScheme);
   if (model()->CurrentTextIsURL() &&
       (host.is_nonempty() || grey_out_url)) {
     [attributedString addAttribute:NSForegroundColorAttributeName
-                             value:BaseTextColor(inDarkMode)
+                             value:BaseTextColor(in_dark_mode)
                              range:as_entire_string];
 
     if (!grey_out_url) {
       [attributedString addAttribute:NSForegroundColorAttributeName
-                               value:HostTextColor(inDarkMode)
+                               value:HostTextColor(in_dark_mode)
                                range:ComponentToNSRange(host)];
     }
   }
 
   // TODO(shess): GTK has this as a member var, figure out why.
   // [Could it be to not change if no change?  If so, I'm guessing
   // AppKit may already handle that.]
   const security_state::SecurityStateModel::SecurityLevel security_level =
       controller()->GetToolbarModel()->GetSecurityLevel(false);
 
   // Emphasize the scheme for security UI display purposes (if necessary).
   if (!model()->user_input_in_progress() && model()->CurrentTextIsURL() &&
       scheme.is_nonempty() &&
       (security_level != security_state::SecurityStateModel::NONE)) {
     NSColor* color;
     if (security_level == security_state::SecurityStateModel::EV_SECURE ||
         security_level == security_state::SecurityStateModel::SECURE) {
-      color = SecureSchemeColor(inDarkMode);
+      color = SecureSchemeColor(in_dark_mode);
     } else if (security_level ==
                security_state::SecurityStateModel::SECURITY_ERROR) {
-      color = SecurityErrorSchemeColor(inDarkMode);
+      color = SecurityErrorSchemeColor(in_dark_mode);
       // Add a strikethrough through the scheme.
       [attributedString addAttribute:NSStrikethroughStyleAttributeName
                  value:[NSNumber numberWithInt:NSUnderlineStyleSingle]
                  range:ComponentToNSRange(scheme)];
     } else if (security_level ==
                security_state::SecurityStateModel::SECURITY_WARNING) {
-      color = SecurityWarningSchemeColor(inDarkMode);
+      color = SecurityWarningSchemeColor(in_dark_mode);
     } else {
       NOTREACHED();
-      color = BaseTextColor(inDarkMode);
+      color = BaseTextColor(in_dark_mode);
     }
     [attributedString addAttribute:NSForegroundColorAttributeName
                              value:color
                              range:ComponentToNSRange(scheme)];
   }
 }
 
 void OmniboxViewMac::OnTemporaryTextMaybeChanged(
     const base::string16& display_text,
     bool save_original_selection,
@@ skipping 499 matching lines @@
 
 NSUInteger OmniboxViewMac::GetTextLength() const {
   return [field_ currentEditor] ?  [[[field_ currentEditor] string] length] :
                                    [[field_ stringValue] length];
 }
 
 bool OmniboxViewMac::IsCaretAtEnd() const {
   const NSRange selection = GetSelectedRange();
   return NSMaxRange(selection) == GetTextLength();
 }