Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2835)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java

Issue 2163393003: Tab switcher theme colors no longer behind flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Littering flags Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java
index 6415820c0f4fc388a036f13d87e208498b4bc16f..f639f1a6727cdabf993489cc4223285f9f9ff6a5 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java
@@ -17,7 +17,6 @@ import org.chromium.chrome.browser.compositor.layouts.Layout.Orientation;
import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab;
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
import org.chromium.chrome.browser.util.ColorUtils;
-import org.chromium.chrome.browser.util.FeatureUtilities;
import org.chromium.ui.resources.ResourceManager;
/**
@@ -62,14 +61,8 @@ public class TabListSceneLayer extends SceneLayer {
? ApiCompatibilityUtils.getColor(res, R.color.incognito_primary_color)
: ApiCompatibilityUtils.getColor(res, R.color.default_primary_color);
- int closeButtonColor = ColorUtils.getThemedAssetColor(defaultThemeColor,
- t.isIncognito());
-
- // If theme colors are enabled in the tab switcher, use them to color the assets.
- if (FeatureUtilities.areTabSwitcherThemeColorsEnabled()) {
- closeButtonColor = ColorUtils.getThemedAssetColor(t.getToolbarBackgroundColor(),
+ int closeButtonColor = ColorUtils.getThemedAssetColor(t.getToolbarBackgroundColor(),
t.isIncognito());
- }
int borderColorResource =
t.isIncognito() ? R.color.tab_back_incognito : R.color.tab_back;

Powered by Google App Engine
This is Rietveld 408576698