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 d4aebcc0dd4736295f3f9f5222d27df9836fa7f4..974d9f1005fdfe869e42c9bab88f81c62b8285be 100644 |
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm |
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm |
@@ -14,6 +14,7 @@ |
#include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/search/search.h" |
+#include "chrome/browser/ssl/security_level_policy.h" |
#include "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h" |
#import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" |
#include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h" |
@@ -512,23 +513,23 @@ void OmniboxViewMac::ApplyTextAttributes(const base::string16& display_text, |
// 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 ToolbarModel::SecurityLevel security_level = |
+ const SecurityLevelPolicy::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 != ToolbarModel::NONE)) { |
+ scheme.is_nonempty() && (security_level != SecurityLevelPolicy::NONE)) { |
NSColor* color; |
- if (security_level == ToolbarModel::EV_SECURE || |
- security_level == ToolbarModel::SECURE) { |
+ if (security_level == SecurityLevelPolicy::EV_SECURE || |
+ security_level == SecurityLevelPolicy::SECURE) { |
color = SecureSchemeColor(); |
- } else if (security_level == ToolbarModel::SECURITY_ERROR) { |
+ } else if (security_level == SecurityLevelPolicy::SECURITY_ERROR) { |
color = SecurityErrorSchemeColor(); |
// Add a strikethrough through the scheme. |
[as addAttribute:NSStrikethroughStyleAttributeName |
value:[NSNumber numberWithInt:NSUnderlineStyleSingle] |
range:ComponentToNSRange(scheme)]; |
- } else if (security_level == ToolbarModel::SECURITY_WARNING) { |
+ } else if (security_level == SecurityLevelPolicy::SECURITY_WARNING) { |
color = BaseTextColor(); |
} else { |
NOTREACHED(); |