New origin security indicator icons.

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
index c8aedec6ccff2c94107ab6326820efd5292eb0b6..d0ad0935e9f0d733cd0db008ace40fd31682647a 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
@@ -57,6 +57,7 @@
 #include "components/prefs/pref_service.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
+#include "components/security_state/security_state_model.h"
 #include "components/translate/core/browser/language_state.h"
 #include "components/ui/zoom/zoom_controller.h"
 #include "components/ui/zoom/zoom_event_manager.h"
@@ -570,11 +571,17 @@ void LocationBarViewMac::UpdateLocationIcon() {
     vector_icon_color = gfx::kGoogleGreen700;
     icon_size = kMaterialSmallIconSize;
   } else {
-    vector_icon_id = omnibox_view_->GetVectorIcon(in_dark_mode);
+    vector_icon_id = omnibox_view_->GetVectorIcon();
     if (in_dark_mode) {
       vector_icon_color = SK_ColorWHITE;
     } else {
-      vector_icon_color = OmniboxViewMac::BaseTextColorSkia(in_dark_mode);
+      security_state::SecurityStateModel::SecurityLevel security_level =
+          GetToolbarModel()->GetSecurityLevel(false);
+      vector_icon_color =
+          (security_level == security_state::SecurityStateModel::NONE)
+              ? OmniboxViewMac::BaseTextColorSkia(in_dark_mode)
+              : skia::NSDeviceColorToSkColor(OmniboxViewMac::GetSecureTextColor(

[groby-ooo-7-16, 2016/05/23 18:54:46]

Question: If we pass in the security level anyways, why not just move the entire
logic into GetSecureTextColor?

[palmer, 2016/05/23 21:11:48]

You mean have GetSecureTextColor call GetToolbarModel()->GetSecurityLevel(false)
? Sure, I suppose we could, although it makes GetSecureTextColor assume the
false argument to GetToolbarModel()->GetSecurityLevel(false), which makes it
potentially less useful for some other callers (if any).

[groby-ooo-7-16, 2016/05/23 23:34:01]

No, I meant handling the ::NONE case in GetSecureTextColor, too. But happy to
punt that to a different CL/debate, since Views doesn't do that either.

+                    security_level, in_dark_mode));
     }
   }