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

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_view_views.cc

Issue 1324293003: Revert of Refactor connection_security into SecurityStateModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_view_views.h ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/omnibox/omnibox_view_views.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index b3ba375157a38b81e7582c3aa84ec77e13a8c633..908e01de7744598f9366963b7369324f2dac18fe 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -142,7 +142,7 @@
make_scoped_ptr(new ChromeOmniboxClient(controller, profile))),
profile_(profile),
popup_window_mode_(popup_window_mode),
- security_level_(SecurityStateModel::NONE),
+ security_level_(connection_security::NONE),
saved_selection_for_focus_change_(gfx::Range::InvalidRange()),
ime_composing_before_change_(false),
delete_at_end_pressed_(false),
@@ -227,7 +227,7 @@
}
void OmniboxViewViews::Update() {
- const SecurityStateModel::SecurityLevel old_security_level = security_level_;
+ const connection_security::SecurityLevel old_security_level = security_level_;
UpdateSecurityLevel();
if (model()->UpdatePermanentText()) {
// Something visibly changed. Re-enable URL replacement.
@@ -329,7 +329,7 @@
views::Textfield::OnNativeThemeChanged(theme);
if (location_bar_view_) {
SetBackgroundColor(location_bar_view_->GetColor(
- SecurityStateModel::NONE, LocationBarView::BACKGROUND));
+ connection_security::NONE, LocationBarView::BACKGROUND));
}
EmphasizeURLComponents();
}
@@ -648,10 +648,11 @@
// may have incorrectly identified a qualifier as a scheme.
SetStyle(gfx::DIAGONAL_STRIKE, false);
if (!model()->user_input_in_progress() && text_is_url &&
- scheme.is_nonempty() && (security_level_ != SecurityStateModel::NONE)) {
+ scheme.is_nonempty() && (security_level_ != connection_security::NONE)) {
SkColor security_color = location_bar_view_->GetColor(
security_level_, LocationBarView::SECURITY_TEXT);
- const bool strike = (security_level_ == SecurityStateModel::SECURITY_ERROR);
+ const bool strike =
+ (security_level_ == connection_security::SECURITY_ERROR);
const gfx::Range scheme_range(scheme.begin, scheme.end());
ApplyColor(security_color, scheme_range);
ApplyStyle(gfx::DIAGONAL_STRIKE, strike, scheme_range);
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_view_views.h ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698