New origin security indicator icons.

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

 // Copyright 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #import "base/mac/mac_util.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 39 matching lines @@
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
 #include "chrome/browser/ui/passwords/manage_passwords_ui_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
 #import "components/omnibox/browser/omnibox_popup_model.h"
 #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"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "grit/components_scaled_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "ui/base/cocoa/cocoa_base_utils.h"
@@ skipping 493 matching lines @@
   bool in_dark_mode = IsLocationBarDark();
 
   SkColor vector_icon_color = gfx::kPlaceholderColor;
   gfx::VectorIconId vector_icon_id = gfx::VectorIconId::VECTOR_ICON_NONE;
   int icon_size = kDefaultIconSize;
   if (ShouldShowEVBubble()) {
     vector_icon_id = gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID_IN_CHIP;
     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));
     }
   }
 
   DCHECK(vector_icon_id != gfx::VectorIconId::VECTOR_ICON_NONE);
   NSImage* image = NSImageFromImageSkiaWithColorSpace(
       gfx::CreateVectorIcon(vector_icon_id, icon_size, vector_icon_color),
       base::mac::GetSRGBColorSpace());
 
   location_icon_decoration_->SetImage(image);
   ev_bubble_decoration_->SetImage(image);
@@ skipping 219 matching lines @@
 
   return zoom_decoration_->UpdateIfNecessary(
       ui_zoom::ZoomController::FromWebContents(web_contents),
       default_zoom_changed, IsLocationBarDark());
 }
 
 void LocationBarViewMac::OnDefaultZoomLevelChanged() {
   if (UpdateZoomDecoration(/*default_zoom_changed=*/true))
     OnDecorationsChanged();
 }