chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java - Issue 2862113003: [Home] Disable theme colors in toolbar

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java

Issue 2862113003: [Home] Disable theme colors in toolbar (Closed)

Patch Set: jk Created 3 years, 7 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarPhone.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarPhone.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java

index 4ab12eac9db981ffca32235be01f27281bd1f3eb..e9f32e0326b138fa528cf0c58dd3bc31cd8675a3 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java

@@ -153,8 +153,7 @@ class ToolbarModelImpl extends ToolbarModel implements ToolbarDataProvider, Tool

@Override

public int getPrimaryColor() {

- if (mBottomSheet != null && mBottomSheet.isSheetOpen()

- && mBottomSheet.getTargetSheetState() != BottomSheet.SHEET_STATE_PEEK) {

+ if (mBottomSheet != null) {

int colorId =

isIncognito() ? R.color.incognito_primary_color : R.color.default_primary_color;

return ApiCompatibilityUtils.getColor(

@@ -165,6 +164,6 @@ class ToolbarModelImpl extends ToolbarModel implements ToolbarDataProvider, Tool

@Override

public boolean isUsingBrandColor() {

- return mIsUsingBrandColor;

+ return mIsUsingBrandColor && mBottomSheet == null;

}