chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java - Issue 1268483004: Plumb the anonymize rect color to toolbar_layer from Tab#getThemeColor

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 1268483004: Plumb the anonymize rect color to toolbar_layer from Tab#getThemeColor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@tabHasThemeColor

Patch Set: Renamed BrandColorUtils in implementation Created 5 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.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 b1e7954ac72f9a24a53843b24a682275fa4ca4d0..d95299d51cba257b8dd588d37e01da536381b253 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

@@ -12,7 +12,6 @@ import org.chromium.chrome.browser.ntp.NewTabPage;

import org.chromium.chrome.browser.tab.ChromeTab;

import org.chromium.chrome.browser.tab.Tab;

import org.chromium.chrome.browser.toolbar.ToolbarModel.ToolbarModelDelegate;

-import org.chromium.chrome.browser.util.FeatureUtilities;

import org.chromium.content_public.browser.WebContents;

/**

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

public void setPrimaryColor(int color) {

mPrimaryColor = color;

Context context = ApplicationStatus.getApplicationContext();

- mIsUsingBrandColor = FeatureUtilities.isDocumentMode(context)

- && !isIncognito()

+ mIsUsingBrandColor = !isIncognito()

&& mPrimaryColor != context.getResources().getColor(R.color.default_primary_color)

&& getTab() != null && !getTab().isNativePage();

}