Update scheme text color in Omnibox only in non-default Security Levels

chrome/browser/ui/views/omnibox/omnibox_view_views.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 552 matching lines @@
   SkColor color = location_bar_view_->GetColor(
       emphasize ? LocationBarView::TEXT : LocationBarView::DEEMPHASIZED_TEXT);
   if (range.IsValid())
     ApplyColor(color, range);
   else
     SetColor(color);
 }
 
 void OmniboxViewViews::UpdateSchemeStyle(const gfx::Range& range) {
   DCHECK(range.IsValid());
-  const SkColor security_color =
-      location_bar_view_->GetSecureTextColor(security_level_);
-  const bool strike = security_level_ == security_state::DANGEROUS;
-  ApplyColor(security_color, range);
-  ApplyStyle(gfx::DIAGONAL_STRIKE, strike, range);
+  // Only SECURE and DANGEROUS levels (pages served over HTTPS or flagged by
+  // SafeBrowsing) get a special scheme color treatment. If the security level
+  // is NONE or HTTP_SHOW_WARNING, we do not override the text style previously
+  // applied to the scheme text range by SetEmphasis().
+  if (security_level_ == security_state::NONE ||
+      security_level_ == security_state::HTTP_SHOW_WARNING)

[Peter Kasting, 2017/03/09 06:02:42]

The addition of HTTP_SHOW_WARNING here is a views behavior change, I think.  I'm
glad we match Mac now; I'm curious what the visible effect of this is and how to
know whether having views match Mac (rather than Mac matching views) is correct.

+    return;
+  ApplyColor(location_bar_view_->GetSecureTextColor(security_level_), range);
+  if (security_level_ == security_state::DANGEROUS)
+    ApplyStyle(gfx::DIAGONAL_STRIKE, true, range);
 }
 
 void OmniboxViewViews::EmphasizeURLComponents() {
   if (!location_bar_view_)
     return;
 
   // If the current contents is a URL, force left-to-right rendering at the
   // paragraph level. Right-to-left runs are still rendered RTL, but will not
   // flip the whole URL around. For example (if "ABC" is Hebrew), this will
   // render "ABC.com" as "CBA.com", rather than "com.CBA".
@@ skipping 465 matching lines @@
       paste_position + 1, IDS_PASTE_AND_GO, IDS_PASTE_AND_GO);
 
   menu_contents->AddSeparator(ui::NORMAL_SEPARATOR);
 
   // Minor note: We use IDC_ for command id here while the underlying textfield
   // is using IDS_ for all its command ids. This is because views cannot depend
   // on IDC_ for now.
   menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES,
       IDS_EDIT_SEARCH_ENGINES);
 }