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 556 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());
+  // Scheme color is only overridden for non-default security levels.

[Peter Kasting, 2017/03/08 03:05:44]

Mac also does this check.  Maybe we should pass the security level to
UpdateTextStyle() so it can do this.

It would also be good to explain this better.  This comment talks about "what",
which I can kind of gather from the code, but it doesn't talk about "why", which
honestly is a bit unclear to me as well.

[elawrence, 2017/03/08 17:23:03]

I've updated the comment. 

Passing the security level up to UpdateTextStyle would require a significant
refactoring because we currently get the level in different ways on Mac vs.
Views, and we'd either need to pass it back down to UpdateSchemeStyle or create
a new set of flag arguments to UpdateSchemeStyle that explain exactly what we
want to have done (StrikeThrough|WarnColor, PlainText|EVColor) etc. 

I feel pretty good about the current code; it's much simpler than it was prior
to this effort and now iOS/Mac/Views are all very similar, with small functions
implementing the platform specific pieces.

+  if (security_level_ == security_state::NONE)
+    return;
   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);
 }
 
 void OmniboxViewViews::EmphasizeURLComponents() {
   if (!location_bar_view_)
     return;
@@ skipping 462 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);
 }