chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java - Issue 2145793002: Enable PaymentRequest on Android by default.

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/payments/PaymentRequestImpl.java

Issue 2145793002: Enable PaymentRequest on Android by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 4 years, 5 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/ChromeSwitches.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java » ('j') | content/public/common/content_features.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

index c95cb333cd53b10330986cd01245309e5b0ab2b0..d2e24dfadd1bdbc63cb79a54ed5ec1d29dbf5bf8 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

@@ -13,6 +13,7 @@ import org.chromium.base.Callback;

import org.chromium.base.Log;

import org.chromium.base.VisibleForTesting;

import org.chromium.chrome.R;

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

import org.chromium.chrome.browser.autofill.PersonalDataManager;

import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;

import org.chromium.chrome.browser.favicon.FaviconHelper;

@@ -194,6 +195,11 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie

if (mContext == null) {

disconnectFromClientWithDebugMessage("Web contents don't have associated activity");

+ return;

+ }

+ if (!ChromeFeatureList.isEnabled(ChromeFeatureList.PAYMENT_REQUEST)) {

+ disconnectFromClientWithDebugMessage("PaymentRequest feature is disabled");

}