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

Unified Diff: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

Issue 2329153002: Remove the WARNING security level.
Patch Set: Restore top control test for sub.originalwebsite.com (but with ERROR instead of WARNING). Created 4 years, 3 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/cocoa/omnibox/omnibox_view_mac.mm
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
index 62821090b35cc488e483bb06132d7f62d88b76b2..c9f13a8b92d678cde2bb99e50ebe412721e7a702 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
@@ -109,11 +109,6 @@ NSColor* SecureSchemeColor(bool in_dark_mode) {
return in_dark_mode ? skia::SkColorToSRGBNSColor(SK_ColorWHITE)
: skia::SkColorToSRGBNSColor(gfx::kGoogleGreen700);
}
-NSColor* SecurityWarningSchemeColor(bool in_dark_mode) {
- return in_dark_mode
- ? skia::SkColorToSRGBNSColor(SkColorSetA(SK_ColorWHITE, 0x7F))
- : skia::SkColorToSRGBNSColor(gfx::kGoogleYellow700);
-}
NSColor* SecurityErrorSchemeColor(bool in_dark_mode) {
if (!ui::MaterialDesignController::IsModeMaterial()) {
return ColorWithRGBBytes(0xa2, 0x00, 0x00);
@@ -195,12 +190,9 @@ NSColor* OmniboxViewMac::GetSecureTextColor(
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,
+ DCHECK_EQ(security_state::SecurityStateModel::SECURITY_ERROR,
security_level);
- return SecurityWarningSchemeColor(in_dark_mode);
+ return SecurityErrorSchemeColor(in_dark_mode);
}
OmniboxViewMac::OmniboxViewMac(OmniboxEditController* controller,
« no previous file with comments | « chrome/browser/ssl/chrome_security_state_model_client.cc ('k') | components/security_state/security_state_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698