Commit 6e15ba86 authored by Matt Simmons's avatar Matt Simmons Committed by Commit Bot

Never show the omnibox shadow if showing on GTS.

R=yusufo@chromium.org

Bug: 970585
Change-Id: I790264b9fab0e7d88da12c737405130d6dd9f28f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1647960
Commit-Queue: Matt Simmons <mattsimmons@chromium.org>
Reviewed-by: default avatarYusuf Ozuysal <yusufo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#667174}
parent 58fab4a9
...@@ -2347,7 +2347,9 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O ...@@ -2347,7 +2347,9 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
// TODO(twellington): Move this shadow state information to ToolbarDataProvider and show // TODO(twellington): Move this shadow state information to ToolbarDataProvider and show
// shadow when incognito NTP is scrolled. // shadow when incognito NTP is scrolled.
return mTabSwitcherState == STATIC_TAB && !hideShadowForIncognitoNtp() return mTabSwitcherState == STATIC_TAB && !hideShadowForIncognitoNtp()
&& !hideShadowForInterstitial(); && !hideShadowForInterstitial()
&& (getToolbarDataProvider() != null
&& !getToolbarDataProvider().isInOverviewAndShowingOmnibox());
} }
private boolean hideShadowForIncognitoNtp() { private boolean hideShadowForIncognitoNtp() {
......
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