Omnibox M5 work, part 1: Security changes...

chrome/browser/autocomplete/autocomplete_edit_view_mac.mm

 // Copyright (c) 2010 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/autocomplete/autocomplete_edit_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
 #include "app/clipboard/clipboard.h"
 #include "app/clipboard/scoped_clipboard_writer.h"
@@ skipping 43 matching lines @@
 // the same values easily.
 const 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];
 }
-const NSColor* SecureBackgroundColor() {
-  return ColorWithRGBBytes(255, 245, 195);  // Yellow
-}
-const NSColor* NormalBackgroundColor() {
-  return [NSColor controlBackgroundColor];
-}
-const NSColor* InsecureBackgroundColor() {
-  return [NSColor controlBackgroundColor];
-}
 
 const NSColor* HostTextColor() {
   return [NSColor blackColor];
 }
 const NSColor* BaseTextColor() {
   return [NSColor darkGrayColor];
 }
+const NSColor* EVSecureSchemeColor() {
+  return ColorWithRGBBytes(0x07, 0x95, 0x00);
+}
 const NSColor* SecureSchemeColor() {
-  return ColorWithRGBBytes(0x00, 0x96, 0x14);
+  return ColorWithRGBBytes(0x00, 0x0e, 0x95);
 }
-const NSColor* InsecureSchemeColor() {
-  return ColorWithRGBBytes(0xc8, 0x00, 0x00);
+const NSColor* SecurityErrorSchemeColor() {
+  return ColorWithRGBBytes(0xa2, 0x00, 0x00);
 }
 
 // Store's the model and view state across tab switches.
 struct AutocompleteEditViewMacState {
   AutocompleteEditViewMacState(const AutocompleteEditModel::State model_state,
                                const bool has_focus, const NSRange& selection)
       : model_state(model_state),
         has_focus(has_focus),
         selection(selection) {
   }
@@ skipping 308 matching lines @@
     [as addAttribute:NSForegroundColorAttributeName value:BaseTextColor()
                range:NSMakeRange(0, [as length])];
 
     [as addAttribute:NSForegroundColorAttributeName value:HostTextColor()
                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 ToolbarModel::SecurityLevel scheme_security_level =
-      toolbar_model_->GetSchemeSecurityLevel();
-
-  if (scheme_security_level == ToolbarModel::SECURE) {
-    [field_ setBackgroundColor:SecureBackgroundColor()];
-  } else if (scheme_security_level == ToolbarModel::NORMAL) {
-    [field_ setBackgroundColor:NormalBackgroundColor()];
-  } else if (scheme_security_level == ToolbarModel::INSECURE) {
-    [field_ setBackgroundColor:InsecureBackgroundColor()];
-  } else {
-    NOTREACHED() << "Unexpected scheme_security_level: "
-                 << scheme_security_level;
-  }
+  const ToolbarModel::SecurityLevel security_level =
+      toolbar_model_->GetSecurityLevel();
 
   // Emphasize the scheme for security UI display purposes (if necessary).
   if (!model_->user_input_in_progress() && scheme.is_nonempty() &&
-      (scheme_security_level != ToolbarModel::NORMAL)) {
+      (security_level != ToolbarModel::NONE)) {
     NSColor* color;
-    if (scheme_security_level == ToolbarModel::SECURE) {
-      color = SecureSchemeColor();
-    } else {
-      color = InsecureSchemeColor();
+    if (security_level == ToolbarModel::EV_SECURE) {
+      color = EVSecureSchemeColor();
+    } else if (security_level == ToolbarModel::SECURITY_ERROR) {
+      color = SecurityErrorSchemeColor();
       // Add a strikethrough through the scheme.
       [as addAttribute:NSStrikethroughStyleAttributeName
                  value:[NSNumber numberWithInt:NSUnderlineStyleSingle]
                  range:ComponentToNSRange(scheme)];
+    } else {
+      color = SecureSchemeColor();
     }
     [as addAttribute:NSForegroundColorAttributeName value:color
                range:ComponentToNSRange(scheme)];
   }
 
   [field_ setAttributedStringValue:as];
 
   // TODO(shess): This may be an appropriate place to call:
   //   controller_->OnChanged();
   // In the current implementation, this tells LocationBarViewMac to
@@ skipping 411 matching lines @@
     clipboard->ReadBookmark(NULL, &url_str);
     // pass resulting url string through GURL to normalize
     GURL url(url_str);
     if (url.is_valid()) {
       return UTF8ToWide(url.spec());
     }
   }
 
   return std::wstring();
 }