New origin security indicator icons.

chrome/browser/ui/views/location_bar/location_bar_view.cc

 // 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/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/i18n/rtl.h"
@@ skipping 344 matching lines @@
 
     case security_state::SecurityStateModel::SECURITY_ERROR: {
       bool md = ui::MaterialDesignController::IsModeMaterial();
       if (md && inverted)
         return GetColor(TEXT);
       color = md ? gfx::kGoogleRed700 : SkColorSetRGB(162, 0, 0);
       break;
     }
 
     case security_state::SecurityStateModel::SECURITY_WARNING:
+    case security_state::SecurityStateModel::NONE:

[Evan Stade, 2016/05/12 16:08:11]

I'd rather you not add this, doesn't seem necessary or make much sense

[palmer, 2016/05/12 21:23:14]

Done.

       return GetColor(TEXT);
       break;
 
     default:
       NOTREACHED();
       return gfx::kPlaceholderColor;
   }
   return color_utils::GetReadableColor(color, GetColor(BACKGROUND));
 }
 
@@ skipping 487 matching lines @@
     return;
 
   if (ui::MaterialDesignController::IsModeMaterial()) {
     gfx::VectorIconId icon_id = gfx::VectorIconId::VECTOR_ICON_NONE;
     const int kIconSize = 16;
     SkColor icon_color = gfx::kPlaceholderColor;
     if (ShouldShowEVBubble()) {
       icon_id = gfx::VectorIconId::LOCATION_BAR_HTTPS_VALID_IN_CHIP;
       icon_color = location_icon_view_->GetTextColor();
     } else {
-      icon_id = omnibox_view_->GetVectorIcon(
-          color_utils::IsDark(GetColor(BACKGROUND)));
-      icon_color = color_utils::DeriveDefaultIconColor(GetColor(TEXT));
+      icon_id = omnibox_view_->GetVectorIcon();
+      security_state::SecurityStateModel::SecurityLevel security_level =
+          GetToolbarModel()->GetSecurityLevel(false);
+      icon_color = GetSecureTextColor(security_level);

[Evan Stade, 2016/05/12 16:08:11]

icon_color = security_level == security_state::SecurityStateModel::NONE ? 
gfx::DeriveDefaultIconColor(GetColor(TEXT)) :
GetSecureTextColor(security_level);

[palmer, 2016/05/12 21:23:14]

Done.

+      // The |GetSecureTextColor| is correct for states with 'marked' security
+      // indicator colors, but to get the final color for the NONE state we need
+      // to do a bit more work:
+      if (security_level == security_state::SecurityStateModel::NONE)
+        icon_color = color_utils::DeriveDefaultIconColor(icon_color);
     }
     location_icon_view_->SetImage(
         gfx::CreateVectorIcon(icon_id, kIconSize, icon_color));
   } else {
     location_icon_view_->SetImage(
         *GetThemeProvider()->GetImageSkiaNamed(omnibox_view_->GetIcon()));
   }
 }
 
 bool LocationBarView::RefreshContentSettingViews() {
@@ skipping 499 matching lines @@
 // LocationBarView, private TemplateURLServiceObserver implementation:
 
 void LocationBarView::OnTemplateURLServiceChanged() {
   template_url_service_->RemoveObserver(this);
   template_url_service_ = nullptr;
   // If the browser is no longer active, let's not show the info bubble, as this
   // would make the browser the active window again.
   if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive())
     ShowFirstRunBubble();
 }