chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java - Issue 1657853002: Naming fixes to bottom bar color extra

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/customtabs/CustomTabIntentDataProvider.java

Issue 1657853002: Naming fixes to bottom bar color extra (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@2623

Patch Set: Created 4 years, 11 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/android/support/customtabs/CustomTabsIntent.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.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/customtabs/CustomTabIntentDataProvider.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java

index ce5f1a586c8e37cac197bfe7d978883e34404be0..958835bffce6d6a4cbd3f465328a2df9b0974d27 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java

@@ -76,7 +76,7 @@ public class CustomTabIntentDataProvider {

mSession = IntentUtils.safeGetBinderExtra(intent, CustomTabsIntent.EXTRA_SESSION);

retrieveCustomButtons(intent, context);

retrieveToolbarColor(intent, context);

- retrieveBottomBarColor(intent, context);

+ retrieveBottomBarColor(intent);

mEnableUrlBarHiding = IntentUtils.safeGetBooleanExtra(

intent, CustomTabsIntent.EXTRA_ENABLE_URLBAR_HIDING, true);

mKeepAliveServiceIntent = IntentUtils.safeGetParcelableExtra(intent, EXTRA_KEEP_ALIVE);

@@ -147,10 +147,10 @@ public class CustomTabIntentDataProvider {

/**

* Must be called after calling {@link #retrieveToolbarColor(Intent, Context)}.

- private void retrieveBottomBarColor(Intent intent, Context context) {

+ private void retrieveBottomBarColor(Intent intent) {

int defaultColor = mToolbarColor;

int color = IntentUtils.safeGetIntExtra(intent,

- CustomTabsIntent.EXTRA_CUSTOM_ACTION_BAR_COLOR, defaultColor);

+ CustomTabsIntent.EXTRA_SECONDARY_ACTION_BAR_COLOR, defaultColor);

mBottomBarColor = removeTransparencyFromColor(color, defaultColor);

}