chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.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/ToolbarManager.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: Moved all flow control to Tab 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

« chrome/android/java/src/org/chromium/chrome/browser/document/BrandColorUtils.java ('K') | « chrome/android/java/src/org/chromium/chrome/browser/toolbar/TabSwitcherDrawable.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModelImpl.java » ('j') | chrome/browser/android/compositor/compositor_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index d91d28ddc0677932261584c3f0256cb35874dabd..06a310f029b1e13cf22e405e7535478de3087efd 100644

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

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

@@ -961,8 +961,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe

int defaultPrimaryColor = isIncognito

? mToolbar.getResources().getColor(R.color.incognito_primary_color)

: mToolbar.getResources().getColor(R.color.default_primary_color);

- int primaryColor = (tab != null && tab.getWebContents() != null)

- ? tab.getWebContents().getThemeColor(defaultPrimaryColor) : defaultPrimaryColor;

+ int primaryColor = tab != null ? tab.getThemeColor() : defaultPrimaryColor;

updatePrimaryColor(primaryColor);

mToolbar.onTabOrModelChanged();