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

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

Issue 1169213006: Make ConnectionSecurityHelper a namespace instead of a class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 6 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 732f7f7c4fb0ada5de4c4461b77c73205d4ac7ad..a85eacefdd2e5813c0111fe1506589aeb31dbc1e 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
@@ -537,24 +537,23 @@ void OmniboxViewMac::ApplyTextAttributes(
// TODO(shess): GTK has this as a member var, figure out why.
// [Could it be to not change if no change? If so, I'm guessing
// AppKit may already handle that.]
- const ConnectionSecurityHelper::SecurityLevel security_level =
+ const connection_security::SecurityLevel security_level =
controller()->GetToolbarModel()->GetSecurityLevel(false);
// Emphasize the scheme for security UI display purposes (if necessary).
if (!model()->user_input_in_progress() && model()->CurrentTextIsURL() &&
- scheme.is_nonempty() &&
- (security_level != ConnectionSecurityHelper::NONE)) {
+ scheme.is_nonempty() && (security_level != connection_security::NONE)) {
NSColor* color;
- if (security_level == ConnectionSecurityHelper::EV_SECURE ||
- security_level == ConnectionSecurityHelper::SECURE) {
+ if (security_level == connection_security::EV_SECURE ||
+ security_level == connection_security::SECURE) {
color = SecureSchemeColor();
- } else if (security_level == ConnectionSecurityHelper::SECURITY_ERROR) {
+ } else if (security_level == connection_security::SECURITY_ERROR) {
color = SecurityErrorSchemeColor();
// Add a strikethrough through the scheme.
[attributedString addAttribute:NSStrikethroughStyleAttributeName
value:[NSNumber numberWithInt:NSUnderlineStyleSingle]
range:ComponentToNSRange(scheme)];
- } else if (security_level == ConnectionSecurityHelper::SECURITY_WARNING) {
+ } else if (security_level == connection_security::SECURITY_WARNING) {
color = BaseTextColor();
} else {
NOTREACHED();

Powered by Google App Engine
This is Rietveld 408576698