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

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

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
« 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 48ce4fcd4c0be408f1336a7cb0938b2281a4ea8f..6507e2ae111f3164cc15de27cb0f8eea9fbd44c2 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -136,7 +136,7 @@ OmniboxViewViews::OmniboxViewViews(OmniboxEditController* controller,
const gfx::FontList& font_list)
: OmniboxView(profile, controller, command_updater),
popup_window_mode_(popup_window_mode),
- security_level_(ConnectionSecurityHelper::NONE),
+ security_level_(connection_security::NONE),
saved_selection_for_focus_change_(gfx::Range::InvalidRange()),
ime_composing_before_change_(false),
delete_at_end_pressed_(false),
@@ -222,8 +222,7 @@ void OmniboxViewViews::ResetTabState(content::WebContents* web_contents) {
}
void OmniboxViewViews::Update() {
- const ConnectionSecurityHelper::SecurityLevel old_security_level =
- security_level_;
+ const connection_security::SecurityLevel old_security_level = security_level_;
security_level_ = controller()->GetToolbarModel()->GetSecurityLevel(false);
if (model()->UpdatePermanentText()) {
// Something visibly changed. Re-enable URL replacement.
@@ -325,7 +324,7 @@ void OmniboxViewViews::OnNativeThemeChanged(const ui::NativeTheme* theme) {
views::Textfield::OnNativeThemeChanged(theme);
if (location_bar_view_) {
SetBackgroundColor(location_bar_view_->GetColor(
- ConnectionSecurityHelper::NONE, LocationBarView::BACKGROUND));
+ connection_security::NONE, LocationBarView::BACKGROUND));
}
EmphasizeURLComponents();
}
@@ -631,12 +630,11 @@ void OmniboxViewViews::EmphasizeURLComponents() {
// may have incorrectly identified a qualifier as a scheme.
SetStyle(gfx::DIAGONAL_STRIKE, false);
if (!model()->user_input_in_progress() && model()->CurrentTextIsURL() &&
- scheme.is_nonempty() &&
- (security_level_ != ConnectionSecurityHelper::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_ == ConnectionSecurityHelper::SECURITY_ERROR);
+ (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