Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3766)

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 1935663002: New origin security indicator icons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Respond to comments, and get the colors right on Mac OS X. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 6b4235d1f1b8bcacf45da01c17582ccdf9de49a4..0c1f9f8f7892236919030fdeb7fe32cf657ea9bb 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -869,9 +869,12 @@ void LocationBarView::RefreshLocationIcon() {
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 = (security_level == security_state::SecurityStateModel::NONE)
+ ? color_utils::DeriveDefaultIconColor(GetColor(TEXT))
+ : GetSecureTextColor(security_level);
}
location_icon_view_->SetImage(
gfx::CreateVectorIcon(icon_id, kIconSize, icon_color));

Powered by Google App Engine
This is Rietveld 408576698