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

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

Issue 1539043002: Pull SecurityStateModel out into a component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 11 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 5a5f50730e685bd95e69b8d1827e6494fd42c625..8c219dff59d861f2ac21cbf166765977713e77f6 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
@@ -544,23 +544,26 @@ 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 SecurityStateModel::SecurityLevel security_level =
+ const security_state::SecurityStateModel::SecurityLevel security_level =
chrome_toolbar_model->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 != SecurityStateModel::NONE)) {
+ scheme.is_nonempty() &&
+ (security_level != security_state::SecurityStateModel::NONE)) {
NSColor* color;
- if (security_level == SecurityStateModel::EV_SECURE ||
- security_level == SecurityStateModel::SECURE) {
+ if (security_level == security_state::SecurityStateModel::EV_SECURE ||
+ security_level == security_state::SecurityStateModel::SECURE) {
color = SecureSchemeColor();
- } else if (security_level == SecurityStateModel::SECURITY_ERROR) {
+ } else if (security_level ==
+ security_state::SecurityStateModel::SECURITY_ERROR) {
color = SecurityErrorSchemeColor();
// Add a strikethrough through the scheme.
[attributedString addAttribute:NSStrikethroughStyleAttributeName
value:[NSNumber numberWithInt:NSUnderlineStyleSingle]
range:ComponentToNSRange(scheme)];
- } else if (security_level == SecurityStateModel::SECURITY_WARNING) {
+ } else if (security_level ==
+ security_state::SecurityStateModel::SECURITY_WARNING) {
color = BaseTextColor();
} else {
NOTREACHED();

Powered by Google App Engine
This is Rietveld 408576698