diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-23 18:09:24 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-23 18:09:24 +0000 |
| commit | 98b5eef7d47215a318634daa9cbc411dae2ecf71 (patch) | |
| tree | 313cc0a7c97c26664fbfa6a4e8f73abcac8b4716 | |
| parent | 7b72492425d945770afab5dc5c6fabae0ed24596 (diff) | |
| download | chromium_src-98b5eef7d47215a318634daa9cbc411dae2ecf71.zip chromium_src-98b5eef7d47215a318634daa9cbc411dae2ecf71.tar.gz chromium_src-98b5eef7d47215a318634daa9cbc411dae2ecf71.tar.bz2 | |
Fix Views Omnibox diagonal strike styling.
Clear the diagonal strike style (before potentially applying URL security styling).
This was a simple regression from my http://crrev.com/180067
OmniboxViewViews previously cleared the diagonal strike style in line 919 of:
https://chromiumcodereview.appspot.com/11535014/diff/57050/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
ApplyURLStyle(textfield_, 0, text.length(), base_color, false);
My change still reset the overall textfield color, but not the diagonal strike style.
BUG=177082
TEST=Get SSL error (https://cacert.org), new tab, switch back to SSL error tab; only scheme has a strike.
R=pkasting@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12315027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184322 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/views/omnibox/omnibox_view_views.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc index 785d0fd..0edcdad 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc @@ -796,6 +796,7 @@ void OmniboxViewViews::EmphasizeURLComponents() { // URLs with search terms, we may have a non-URL even when the user is not // editing; and in some cases, e.g. for "site:foo.com" searches, the parser // 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_ != ToolbarModel::NONE)) { SkColor security_color = location_bar_view_->GetColor( |