Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java

Issue 2452243002: [Payments] Remove credit scan scanner experimental flag (Closed)
Patch Set: Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser.payments; 5 package org.chromium.chrome.browser.payments;
6 6
7 import android.os.AsyncTask; 7 import android.os.AsyncTask;
8 import android.os.Handler; 8 import android.os.Handler;
9 import android.text.TextUtils; 9 import android.text.TextUtils;
10 import android.util.Pair; 10 import android.util.Pair;
11 11
12 import org.chromium.base.Callback; 12 import org.chromium.base.Callback;
13 import org.chromium.chrome.R; 13 import org.chromium.chrome.R;
14 import org.chromium.chrome.browser.ChromeFeatureList;
15 import org.chromium.chrome.browser.autofill.CreditCardScanner; 14 import org.chromium.chrome.browser.autofill.CreditCardScanner;
16 import org.chromium.chrome.browser.autofill.PersonalDataManager; 15 import org.chromium.chrome.browser.autofill.PersonalDataManager;
17 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile; 16 import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
18 import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard; 17 import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
19 import org.chromium.chrome.browser.payments.PaymentRequestImpl.PaymentRequestSer viceObserverForTest; 18 import org.chromium.chrome.browser.payments.PaymentRequestImpl.PaymentRequestSer viceObserverForTest;
20 import org.chromium.chrome.browser.payments.ui.EditorFieldModel; 19 import org.chromium.chrome.browser.payments.ui.EditorFieldModel;
21 import org.chromium.chrome.browser.payments.ui.EditorFieldModel.EditorFieldValid ator; 20 import org.chromium.chrome.browser.payments.ui.EditorFieldModel.EditorFieldValid ator;
22 import org.chromium.chrome.browser.payments.ui.EditorModel; 21 import org.chromium.chrome.browser.payments.ui.EditorModel;
23 import org.chromium.chrome.browser.preferences.autofill.AutofillProfileBridge.Dr opdownKeyValue; 22 import org.chromium.chrome.browser.preferences.autofill.AutofillProfileBridge.Dr opdownKeyValue;
24 import org.chromium.content.browser.ContentViewCore; 23 import org.chromium.content.browser.ContentViewCore;
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 icons.add(mAcceptedCardTypeInfos.get(i).icon); 353 icons.add(mAcceptedCardTypeInfos.get(i).icon);
355 descriptions.add(mAcceptedCardTypeInfos.get(i).description); 354 descriptions.add(mAcceptedCardTypeInfos.get(i).description);
356 } 355 }
357 mIconHint = EditorFieldModel.createIconList( 356 mIconHint = EditorFieldModel.createIconList(
358 mContext.getString(R.string.payments_accepted_cards_label), icons, 357 mContext.getString(R.string.payments_accepted_cards_label), icons,
359 descriptions); 358 descriptions);
360 } 359 }
361 editor.addField(mIconHint); 360 editor.addField(mIconHint);
362 361
363 // Card scanner is expensive to query. 362 // Card scanner is expensive to query.
364 if (mCardScanner == null 363 if (mCardScanner == null) {
365 && ChromeFeatureList.isEnabled(ChromeFeatureList.SCAN_CARDS_IN_W EB_PAYMENTS)) {
366 mCardScanner = CreditCardScanner.create(mContext, 364 mCardScanner = CreditCardScanner.create(mContext,
367 ContentViewCore.fromWebContents(mWebContents).getWindowAndro id(), 365 ContentViewCore.fromWebContents(mWebContents).getWindowAndro id(),
368 this); 366 this);
369 mCanScan = mCardScanner.canScan(); 367 mCanScan = mCardScanner.canScan();
370 } 368 }
371 369
372 // Card number is validated. 370 // Card number is validated.
373 if (mNumberField == null) { 371 if (mNumberField == null) {
374 mNumberField = EditorFieldModel.createTextInput( 372 mNumberField = EditorFieldModel.createTextInput(
375 EditorFieldModel.INPUT_TYPE_HINT_CREDIT_CARD, 373 EditorFieldModel.INPUT_TYPE_HINT_CREDIT_CARD,
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 606
609 mEditorView.update(); 607 mEditorView.update();
610 mIsScanning = false; 608 mIsScanning = false;
611 } 609 }
612 610
613 @Override 611 @Override
614 public void onScanCancelled() { 612 public void onScanCancelled() {
615 mIsScanning = false; 613 mIsScanning = false;
616 } 614 }
617 } 615 }
OLDNEW
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java ('k') | chrome/app/generated_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698