Commit 3b671f12 authored by Ted Choc's avatar Ted Choc Committed by Commit Bot

Fix startup crash from security icon change for scheme hiding experiment.

BUG=837761

Change-Id: Ib256ba3133eae770167b5e06ae6c8ad9d0436658
Reviewed-on: https://chromium-review.googlesource.com/1033589Reviewed-by: default avatarYusuf Ozuysal <yusufo@chromium.org>
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554501}
parent 13dfb327
...@@ -395,7 +395,7 @@ public class ToolbarModel implements ToolbarDataProvider { ...@@ -395,7 +395,7 @@ public class ToolbarModel implements ToolbarDataProvider {
if (isIncognito() || needLightIcon) { if (isIncognito() || needLightIcon) {
// For a dark theme color, use light icons. // For a dark theme color, use light icons.
list = ApiCompatibilityUtils.getColorStateList(resources, R.color.light_mode_tint); list = ApiCompatibilityUtils.getColorStateList(resources, R.color.light_mode_tint);
} else if (isUsingBrandColor() } else if (!hasTab() || isUsingBrandColor()
|| ChromeFeatureList.isEnabled( || ChromeFeatureList.isEnabled(
ChromeFeatureList.OMNIBOX_HIDE_SCHEME_DOMAIN_IN_STEADY_STATE)) { ChromeFeatureList.OMNIBOX_HIDE_SCHEME_DOMAIN_IN_STEADY_STATE)) {
// For theme colors which are not dark and are also not // For theme colors which are not dark and are also not
......
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