Commit 4e4f8de1 authored by Mei Liang's avatar Mei Liang Committed by Commit Bot

Update navigation bar and status bar color in incognito

This CL updates the system navigation bar and top status bar in GTS for
incognito.

Change-Id: I169c8706eeaa7bb7b4994b02f2bcfffb53fb2b9f
Bug: 997345
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1769632Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Commit-Queue: Mei Liang <meiliang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#690133}
parent f363f71c
......@@ -28,6 +28,7 @@ import org.chromium.chrome.browser.tabmodel.TabModel;
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
import org.chromium.chrome.browser.tabmodel.TabModelSelectorObserver;
import org.chromium.chrome.browser.ui.ImmersiveModeManager;
import org.chromium.chrome.browser.util.FeatureUtilities;
import org.chromium.chrome.browser.vr.VrModeObserver;
import org.chromium.chrome.browser.vr.VrModuleProvider;
import org.chromium.ui.UiUtils;
......@@ -182,7 +183,8 @@ class TabbedNavigationBarColorController implements VrModeObserver {
boolean useLightNavigation;
if (ChromeFeatureList.isInitialized()
&& (ChromeFeatureList.isEnabled(ChromeFeatureList.HORIZONTAL_TAB_SWITCHER_ANDROID)
|| DeviceClassManager.enableAccessibilityLayout())) {
|| DeviceClassManager.enableAccessibilityLayout()
|| FeatureUtilities.isGridTabSwitcherEnabled())) {
useLightNavigation = !mTabModelSelector.isIncognitoSelected();
} else {
useLightNavigation = !mTabModelSelector.isIncognitoSelected() || overviewVisible;
......
......@@ -31,6 +31,7 @@ import org.chromium.chrome.browser.tabmodel.TabModelSelectorObserver;
import org.chromium.chrome.browser.tabmodel.TabSelectionType;
import org.chromium.chrome.browser.toolbar.top.TopToolbarCoordinator;
import org.chromium.chrome.browser.util.ColorUtils;
import org.chromium.chrome.browser.util.FeatureUtilities;
import org.chromium.chrome.browser.widget.ScrimView;
import org.chromium.ui.UiUtils;
......@@ -256,7 +257,8 @@ public class StatusBarColorController
if (!ChromeFeatureList.isInitialized()
|| (!ChromeFeatureList.isEnabled(
ChromeFeatureList.HORIZONTAL_TAB_SWITCHER_ANDROID)
&& !DeviceClassManager.enableAccessibilityLayout())) {
&& !DeviceClassManager.enableAccessibilityLayout()
&& !FeatureUtilities.isGridTabSwitcherEnabled())) {
return mStandardPrimaryBgColor;
}
......
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