chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java - Issue 1234653004: webapps: utilize manifest theme colors

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/webapps/WebappActivity.java

Issue 1234653004: webapps: utilize manifest theme colors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix missing include 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/webapps/FullScreenActivityTab.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappInfo.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/webapps/WebappActivity.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java

index 6a7029a64af5c5ae9abe62b9f54880699a9a5ecd..3c0c1328f4280a012aef36de2feee6e99635e8d5 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java

@@ -17,6 +17,7 @@ import org.chromium.base.ActivityState;

import org.chromium.base.ApplicationStatus;

import org.chromium.base.VisibleForTesting;

import org.chromium.chrome.R;

+import org.chromium.chrome.browser.ShortcutHelper;

import org.chromium.chrome.browser.UrlUtilities;

import org.chromium.chrome.browser.document.DocumentUtils;

import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;

@@ -263,6 +264,12 @@ public class WebappActivity extends FullScreenActivity {

? getActivityTab().getTitle() : mWebappInfo.shortName();

Bitmap icon = mWebappInfo.icon() == null

? getActivityTab().getFavicon() : mWebappInfo.icon();

+ if (mBrandColor == null

+ && mWebappInfo.themeColor() != ShortcutHelper.THEME_COLOR_INVALID_OR_MISSING

+ && (mWebappInfo.themeColor() & 0xFF000000L) != 0) {

+ mBrandColor = (int) mWebappInfo.themeColor();

+ }

int color = mBrandColor == null

? getResources().getColor(R.color.default_primary_color) : mBrandColor;