New origin security indicator icons.

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 157 matching lines @@
 }
 
 // static
 NSColor* OmniboxViewMac::BaseTextColor(bool in_dark_mode) {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return [NSColor darkGrayColor];
   }
   return skia::SkColorToCalibratedNSColor(BaseTextColorSkia(in_dark_mode));
 }
 
+// static
+NSColor* OmniboxViewMac::GetSecureTextColor(
+    security_state::SecurityStateModel::SecurityLevel security_level,
+    bool in_dark_mode) {
+  if (security_level == security_state::SecurityStateModel::EV_SECURE ||
+      security_level == security_state::SecurityStateModel::SECURE) {

[Evan Stade, 2016/05/19 22:00:45]

wait, I lost the part where it was explained why we moved away from a switch.
switch has the nice property of complaining when you add a new enum value that
isn't handled (provided you avoid default)

[Peter Kasting, 2016/05/19 22:02:59]

We don't want to handle every value in the enum in this function, so we'd need a
default case, which eliminates that benefit.

[Evan Stade, 2016/05/19 22:09:07]

well, I'd handle that with

[...]
  case NONE:
  case SECURITY_POLICY_WARNING:
    NOTREACHED();
}

return NsDummyColor;

[Peter Kasting, 2016/05/19 22:50:11]

We could.  It's not a huge deal.  But to me the potential win of being warned on
an added case in the future that we don't add here is less than the loss from
having to explicitly write out each case we don't think will get here anyway,
especially when this is technically more in keeping with the "don't handle
DCHECK failure" policy (arguably).

I say this partly because we're in the midst of a project to try and actively
_reduce_ the number of security states, so it seems especially unlikely we'd add
more.

+    return SecureSchemeColor(in_dark_mode);
+  }
+
+  if (security_level == security_state::SecurityStateModel::SECURITY_ERROR)
+    return SecurityErrorSchemeColor(in_dark_mode);
+
+  DCHECK_EQ(security_state::SecurityStateModel::SECURITY_WARNING,
+            security_level);
+  return SecurityWarningSchemeColor(in_dark_mode);
+}
+
 OmniboxViewMac::OmniboxViewMac(OmniboxEditController* controller,
                                Profile* profile,
                                CommandUpdater* command_updater,
                                AutocompleteTextField* field)
     : OmniboxView(
           controller,
           base::WrapUnique(new ChromeOmniboxClient(controller, profile))),
       profile_(profile),
       popup_view_(new OmniboxPopupViewMac(this, model(), field)),
       field_(field),
@@ skipping 403 matching lines @@
   // 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(in_dark_mode);
-    } else if (security_level ==
-               security_state::SecurityStateModel::SECURITY_ERROR) {
-      color = SecurityErrorSchemeColor(in_dark_mode);
+    if (security_level == security_state::SecurityStateModel::SECURITY_ERROR) {
       // 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(in_dark_mode);
-    } else {
-      NOTREACHED();
-      color = BaseTextColor(in_dark_mode);
     }
-    [attributedString addAttribute:NSForegroundColorAttributeName
-                             value:color
-                             range:ComponentToNSRange(scheme)];
+    [attributedString
+        addAttribute:NSForegroundColorAttributeName
+               value:GetSecureTextColor(security_level, in_dark_mode)
+               range:ComponentToNSRange(scheme)];
   }
 }
 
 void OmniboxViewMac::OnTemporaryTextMaybeChanged(
     const base::string16& display_text,
     bool save_original_selection,
     bool notify_text_changed) {
   if (save_original_selection)
     saved_temporary_selection_ = GetSelectedRange();
 
@@ skipping 501 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();
 }