Commit 9aba6c9c authored by estade's avatar estade Committed by Commit bot

Fix color of looking glass when searching on remote NTP.

BUG=616191

Review-Url: https://codereview.chromium.org/2028933002
Cr-Commit-Position: refs/heads/master@{#397805}
parent 70f47676
...@@ -338,7 +338,7 @@ SkColor LocationBarView::GetColor( ...@@ -338,7 +338,7 @@ SkColor LocationBarView::GetColor(
case EV_BUBBLE_TEXT_AND_BORDER: case EV_BUBBLE_TEXT_AND_BORDER:
return ui::MaterialDesignController::IsModeMaterial() return ui::MaterialDesignController::IsModeMaterial()
? GetSecureTextColor( ? GetSecureTextColor(
GetToolbarModel()->GetSecurityLevel(false)) security_state::SecurityStateModel::EV_SECURE)
: SkColorSetRGB(7, 149, 0); : SkColorSetRGB(7, 149, 0);
} }
NOTREACHED(); NOTREACHED();
......
...@@ -98,8 +98,8 @@ bool ToolbarModelImpl::WouldPerformSearchTermReplacement( ...@@ -98,8 +98,8 @@ bool ToolbarModelImpl::WouldPerformSearchTermReplacement(
SecurityStateModel::SecurityLevel ToolbarModelImpl::GetSecurityLevel( SecurityStateModel::SecurityLevel ToolbarModelImpl::GetSecurityLevel(
bool ignore_editing) const { bool ignore_editing) const {
// When editing, assume no security style. // When editing or empty, assume no security style.
return (input_in_progress() && !ignore_editing) return ((input_in_progress() && !ignore_editing) || !ShouldDisplayURL())
? SecurityStateModel::NONE ? SecurityStateModel::NONE
: delegate_->GetSecurityLevel(); : delegate_->GetSecurityLevel();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment