Commit 4cbc5031 authored by siyua's avatar siyua Committed by Commit Bot

Integrate credit card migration feedback files into AutofillClient

1. Modify autofill_client files and local_card_migration_manager to
wire up files in CL 1300473

2. Changed method name to ShowOfferDialog to match the
ShowFeedbackDialog.

Bug: 897998
Change-Id: I6490ab18e1e822da13d550b0fb7d30d3fcebdec6
Reviewed-on: https://chromium-review.googlesource.com/c/1307074Reviewed-by: default avatarFabio Tirelo <ftirelo@chromium.org>
Reviewed-by: default avatarTao Bai <michaelbai@chromium.org>
Reviewed-by: default avatarEugene But <eugenebut@chromium.org>
Commit-Queue: Siyu An <siyua@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606213}
parent 0d7b74a3
...@@ -313,6 +313,13 @@ void AwAutofillClient::ConfirmSaveCreditCardToCloud( ...@@ -313,6 +313,13 @@ void AwAutofillClient::ConfirmSaveCreditCardToCloud(
NOTIMPLEMENTED(); NOTIMPLEMENTED();
} }
void AwAutofillClient::ShowLocalCardMigrationResults(
const base::string16& tip_message,
const std::vector<autofill::MigratableCreditCard>&
migratable_credit_cards) {
NOTIMPLEMENTED();
}
void AwAutofillClient::ConfirmCreditCardFillAssist( void AwAutofillClient::ConfirmCreditCardFillAssist(
const autofill::CreditCard& card, const autofill::CreditCard& card,
const base::Closure& callback) { const base::Closure& callback) {
......
...@@ -84,6 +84,10 @@ class AwAutofillClient : public autofill::AutofillClient, ...@@ -84,6 +84,10 @@ class AwAutofillClient : public autofill::AutofillClient,
const std::vector<autofill::MigratableCreditCard>& const std::vector<autofill::MigratableCreditCard>&
migratable_credit_cards, migratable_credit_cards,
LocalCardMigrationCallback start_migrating_cards_callback) override; LocalCardMigrationCallback start_migrating_cards_callback) override;
void ShowLocalCardMigrationResults(
const base::string16& tip_message,
const std::vector<autofill::MigratableCreditCard>&
migratable_credit_cards) override;
void ConfirmSaveAutofillProfile(const autofill::AutofillProfile& profile, void ConfirmSaveAutofillProfile(const autofill::AutofillProfile& profile,
base::OnceClosure callback) override; base::OnceClosure callback) override;
void ConfirmSaveCreditCardLocally(const autofill::CreditCard& card, void ConfirmSaveCreditCardLocally(const autofill::CreditCard& card,
......
...@@ -261,13 +261,29 @@ void ChromeAutofillClient::ConfirmMigrateLocalCardToCloud( ...@@ -261,13 +261,29 @@ void ChromeAutofillClient::ConfirmMigrateLocalCardToCloud(
autofill::LocalCardMigrationDialogControllerImpl* controller = autofill::LocalCardMigrationDialogControllerImpl* controller =
autofill::LocalCardMigrationDialogControllerImpl::FromWebContents( autofill::LocalCardMigrationDialogControllerImpl::FromWebContents(
web_contents()); web_contents());
controller->ShowDialog( controller->ShowOfferDialog(
std::move(legal_message), std::move(legal_message),
CreateLocalCardMigrationDialogView(controller, web_contents()), CreateLocalCardMigrationDialogView(controller, web_contents()),
migratable_credit_cards, std::move(start_migrating_cards_callback)); migratable_credit_cards, std::move(start_migrating_cards_callback));
#endif #endif
} }
void ChromeAutofillClient::ShowLocalCardMigrationResults(
const base::string16& tip_message,
const std::vector<MigratableCreditCard>& migratable_credit_cards) {
#if !defined(OS_ANDROID)
autofill::LocalCardMigrationDialogControllerImpl::CreateForWebContents(
web_contents());
autofill::LocalCardMigrationDialogControllerImpl* controller =
autofill::LocalCardMigrationDialogControllerImpl::FromWebContents(
web_contents());
controller->ShowFeedbackDialog(
tip_message,
CreateLocalCardMigrationDialogView(controller, web_contents()),
migratable_credit_cards);
#endif
}
void ChromeAutofillClient::ConfirmSaveAutofillProfile( void ChromeAutofillClient::ConfirmSaveAutofillProfile(
const AutofillProfile& profile, const AutofillProfile& profile,
base::OnceClosure callback) { base::OnceClosure callback) {
......
...@@ -72,6 +72,9 @@ class ChromeAutofillClient ...@@ -72,6 +72,9 @@ class ChromeAutofillClient
std::unique_ptr<base::DictionaryValue> legal_message, std::unique_ptr<base::DictionaryValue> legal_message,
const std::vector<MigratableCreditCard>& migratable_credit_cards, const std::vector<MigratableCreditCard>& migratable_credit_cards,
LocalCardMigrationCallback start_migrating_cards_callback) override; LocalCardMigrationCallback start_migrating_cards_callback) override;
void ShowLocalCardMigrationResults(const base::string16& tip_message,
const std::vector<MigratableCreditCard>&
migratable_credit_cards) override;
void ConfirmSaveAutofillProfile(const AutofillProfile& profile, void ConfirmSaveAutofillProfile(const AutofillProfile& profile,
base::OnceClosure callback) override; base::OnceClosure callback) override;
void ConfirmSaveCreditCardLocally(const CreditCard& card, void ConfirmSaveCreditCardLocally(const CreditCard& card,
......
...@@ -41,7 +41,7 @@ LocalCardMigrationDialogControllerImpl:: ...@@ -41,7 +41,7 @@ LocalCardMigrationDialogControllerImpl::
local_card_migration_dialog_->CloseDialog(); local_card_migration_dialog_->CloseDialog();
} }
void LocalCardMigrationDialogControllerImpl::ShowDialog( void LocalCardMigrationDialogControllerImpl::ShowOfferDialog(
std::unique_ptr<base::DictionaryValue> legal_message, std::unique_ptr<base::DictionaryValue> legal_message,
LocalCardMigrationDialog* local_card_migration_dialog, LocalCardMigrationDialog* local_card_migration_dialog,
const std::vector<MigratableCreditCard>& migratable_credit_cards, const std::vector<MigratableCreditCard>& migratable_credit_cards,
......
...@@ -27,7 +27,7 @@ class LocalCardMigrationDialogControllerImpl ...@@ -27,7 +27,7 @@ class LocalCardMigrationDialogControllerImpl
public: public:
~LocalCardMigrationDialogControllerImpl() override; ~LocalCardMigrationDialogControllerImpl() override;
void ShowDialog( void ShowOfferDialog(
std::unique_ptr<base::DictionaryValue> legal_message, std::unique_ptr<base::DictionaryValue> legal_message,
LocalCardMigrationDialog* local_card_migration_dialog, LocalCardMigrationDialog* local_card_migration_dialog,
const std::vector<MigratableCreditCard>& migratable_credit_cards, const std::vector<MigratableCreditCard>& migratable_credit_cards,
......
...@@ -179,6 +179,12 @@ class AutofillClient : public RiskDataLoader { ...@@ -179,6 +179,12 @@ class AutofillClient : public RiskDataLoader {
const std::vector<MigratableCreditCard>& migratable_credit_cards, const std::vector<MigratableCreditCard>& migratable_credit_cards,
LocalCardMigrationCallback start_migrating_cards_callback) = 0; LocalCardMigrationCallback start_migrating_cards_callback) = 0;
// Will show a dialog with all the selected card migration results. Invoked
// when the migration process is finished.
virtual void ShowLocalCardMigrationResults(
const base::string16& tip_message,
const std::vector<MigratableCreditCard>& migratable_credit_cards) = 0;
// Runs |callback| if the |profile| should be imported as personal data. // Runs |callback| if the |profile| should be imported as personal data.
virtual void ConfirmSaveAutofillProfile(const AutofillProfile& profile, virtual void ConfirmSaveAutofillProfile(const AutofillProfile& profile,
base::OnceClosure callback) = 0; base::OnceClosure callback) = 0;
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <vector> #include <vector>
#include "base/bind.h" #include "base/bind.h"
#include "base/strings/utf_string_conversions.h"
#include "components/autofill/core/browser/autofill_client.h" #include "components/autofill/core/browser/autofill_client.h"
#include "components/autofill/core/browser/autofill_experiments.h" #include "components/autofill/core/browser/autofill_experiments.h"
#include "components/autofill/core/browser/autofill_metrics.h" #include "components/autofill/core/browser/autofill_metrics.h"
...@@ -216,7 +217,11 @@ void LocalCardMigrationManager::OnDidMigrateLocalCards( ...@@ -216,7 +217,11 @@ void LocalCardMigrationManager::OnDidMigrateLocalCards(
// Remove cards that were successfully migrated from local storage. // Remove cards that were successfully migrated from local storage.
personal_data_manager_->DeleteLocalCreditCards(migrated_cards); personal_data_manager_->DeleteLocalCreditCards(migrated_cards);
// TODO(crbug.com/852904): Trigger the show result window. if (base::FeatureList::IsEnabled(
features::kAutofillLocalCardMigrationShowFeedback)) {
client_->ShowLocalCardMigrationResults(base::UTF8ToUTF16(display_text),
migratable_credit_cards_);
}
} }
void LocalCardMigrationManager::OnDidGetMigrationRiskData( void LocalCardMigrationManager::OnDidGetMigrationRiskData(
......
...@@ -102,6 +102,10 @@ void TestAutofillClient::ConfirmMigrateLocalCardToCloud( ...@@ -102,6 +102,10 @@ void TestAutofillClient::ConfirmMigrateLocalCardToCloud(
std::move(start_migrating_cards_callback).Run(migration_card_selection_); std::move(start_migrating_cards_callback).Run(migration_card_selection_);
} }
void TestAutofillClient::ShowLocalCardMigrationResults(
const base::string16& tip_message,
const std::vector<MigratableCreditCard>& migratable_credit_cards) {}
void TestAutofillClient::ConfirmSaveAutofillProfile( void TestAutofillClient::ConfirmSaveAutofillProfile(
const AutofillProfile& profile, const AutofillProfile& profile,
base::OnceClosure callback) { base::OnceClosure callback) {
......
...@@ -54,6 +54,9 @@ class TestAutofillClient : public AutofillClient { ...@@ -54,6 +54,9 @@ class TestAutofillClient : public AutofillClient {
std::unique_ptr<base::DictionaryValue> legal_message, std::unique_ptr<base::DictionaryValue> legal_message,
const std::vector<MigratableCreditCard>& migratable_credit_cards, const std::vector<MigratableCreditCard>& migratable_credit_cards,
LocalCardMigrationCallback start_migrating_cards_callback) override; LocalCardMigrationCallback start_migrating_cards_callback) override;
void ShowLocalCardMigrationResults(const base::string16& tip_message,
const std::vector<MigratableCreditCard>&
migratable_credit_cards) override;
void ConfirmSaveAutofillProfile(const AutofillProfile& profile, void ConfirmSaveAutofillProfile(const AutofillProfile& profile,
base::OnceClosure callback) override; base::OnceClosure callback) override;
void ConfirmSaveCreditCardLocally(const CreditCard& card, void ConfirmSaveCreditCardLocally(const CreditCard& card,
......
...@@ -66,6 +66,9 @@ class ChromeAutofillClientIOS : public AutofillClient { ...@@ -66,6 +66,9 @@ class ChromeAutofillClientIOS : public AutofillClient {
std::unique_ptr<base::DictionaryValue> legal_message, std::unique_ptr<base::DictionaryValue> legal_message,
const std::vector<MigratableCreditCard>& migratable_credit_cards, const std::vector<MigratableCreditCard>& migratable_credit_cards,
LocalCardMigrationCallback start_migrating_cards_callback) override; LocalCardMigrationCallback start_migrating_cards_callback) override;
void ShowLocalCardMigrationResults(const base::string16& tip_message,
const std::vector<MigratableCreditCard>&
migratable_credit_cards) override;
void ConfirmSaveAutofillProfile(const AutofillProfile& profile, void ConfirmSaveAutofillProfile(const AutofillProfile& profile,
base::OnceClosure callback) override; base::OnceClosure callback) override;
void ConfirmSaveCreditCardLocally(const CreditCard& card, void ConfirmSaveCreditCardLocally(const CreditCard& card,
......
...@@ -216,6 +216,12 @@ void ChromeAutofillClientIOS::ConfirmMigrateLocalCardToCloud( ...@@ -216,6 +216,12 @@ void ChromeAutofillClientIOS::ConfirmMigrateLocalCardToCloud(
NOTIMPLEMENTED(); NOTIMPLEMENTED();
} }
void ChromeAutofillClientIOS::ShowLocalCardMigrationResults(
const base::string16& tip_message,
const std::vector<MigratableCreditCard>& migratable_credit_cards) {
NOTIMPLEMENTED();
}
void ChromeAutofillClientIOS::ConfirmSaveCreditCardToCloud( void ChromeAutofillClientIOS::ConfirmSaveCreditCardToCloud(
const CreditCard& card, const CreditCard& card,
std::unique_ptr<base::DictionaryValue> legal_message, std::unique_ptr<base::DictionaryValue> legal_message,
......
...@@ -60,6 +60,9 @@ class WebViewAutofillClientIOS : public AutofillClient { ...@@ -60,6 +60,9 @@ class WebViewAutofillClientIOS : public AutofillClient {
std::unique_ptr<base::DictionaryValue> legal_message, std::unique_ptr<base::DictionaryValue> legal_message,
const std::vector<MigratableCreditCard>& migratable_credit_cards, const std::vector<MigratableCreditCard>& migratable_credit_cards,
LocalCardMigrationCallback start_migrating_cards_callback) override; LocalCardMigrationCallback start_migrating_cards_callback) override;
void ShowLocalCardMigrationResults(const base::string16& tip_message,
const std::vector<MigratableCreditCard>&
migratable_credit_cards) override;
void ConfirmSaveAutofillProfile(const AutofillProfile& profile, void ConfirmSaveAutofillProfile(const AutofillProfile& profile,
base::OnceClosure callback) override; base::OnceClosure callback) override;
void ConfirmSaveCreditCardLocally(const CreditCard& card, void ConfirmSaveCreditCardLocally(const CreditCard& card,
......
...@@ -137,6 +137,12 @@ void WebViewAutofillClientIOS::ConfirmMigrateLocalCardToCloud( ...@@ -137,6 +137,12 @@ void WebViewAutofillClientIOS::ConfirmMigrateLocalCardToCloud(
NOTIMPLEMENTED(); NOTIMPLEMENTED();
} }
void WebViewAutofillClientIOS::ShowLocalCardMigrationResults(
const base::string16& tip_message,
const std::vector<MigratableCreditCard>& migratable_credit_cards) {
NOTIMPLEMENTED();
}
void WebViewAutofillClientIOS::ConfirmSaveAutofillProfile( void WebViewAutofillClientIOS::ConfirmSaveAutofillProfile(
const AutofillProfile& profile, const AutofillProfile& profile,
base::OnceClosure callback) { base::OnceClosure callback) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment