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

Unified Diff: components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.cc

Issue 1138653003: Move card unmask interfaces and controller into the autofill component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix missing override declaration Created 5 years, 7 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
Index: components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.cc
diff --git a/chrome/browser/ui/autofill/card_unmask_prompt_controller_impl.cc b/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.cc
similarity index 90%
rename from chrome/browser/ui/autofill/card_unmask_prompt_controller_impl.cc
rename to components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.cc
index 6de0858e51ef017a91863ef93755ac4386242f6b..af3b9c153f687ae2656d497eb3acd2e634acb460 100644
--- a/chrome/browser/ui/autofill/card_unmask_prompt_controller_impl.cc
+++ b/components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.cc
@@ -2,31 +2,28 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/ui/autofill/card_unmask_prompt_controller_impl.h"
+#include "components/autofill/core/browser/ui/card_unmask_prompt_controller_impl.h"
#include "base/bind.h"
#include "base/prefs/pref_service.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/autofill/card_unmask_prompt_view.h"
-#include "chrome/grit/generated_resources.h"
#include "components/autofill/core/browser/autofill_experiments.h"
#include "components/autofill/core/browser/autofill_metrics.h"
+#include "components/autofill/core/browser/ui/card_unmask_prompt_view.h"
#include "components/autofill/core/common/autofill_pref_names.h"
-#include "grit/theme_resources.h"
+#include "grit/components_scaled_resources.h"
+#include "grit/components_strings.h"
#include "ui/base/l10n/l10n_util.h"
namespace autofill {
CardUnmaskPromptControllerImpl::CardUnmaskPromptControllerImpl(
- content::WebContents* web_contents,
const RiskDataCallback& risk_data_callback,
PrefService* pref_service,
bool is_off_the_record)
- : web_contents_(web_contents),
- risk_data_callback_(risk_data_callback),
+ : risk_data_callback_(risk_data_callback),
pref_service_(pref_service),
new_card_link_clicked_(false),
is_off_the_record_(is_off_the_record),
@@ -43,6 +40,7 @@ CardUnmaskPromptControllerImpl::~CardUnmaskPromptControllerImpl() {
}
void CardUnmaskPromptControllerImpl::ShowPrompt(
+ CardUnmaskPromptView* card_unmask_view,
const CreditCard& card,
base::WeakPtr<CardUnmaskDelegate> delegate) {
if (card_unmask_view_)
@@ -51,9 +49,10 @@ void CardUnmaskPromptControllerImpl::ShowPrompt(
shown_timestamp_ = base::Time::Now();
pending_response_ = CardUnmaskDelegate::UnmaskResponse();
LoadRiskFingerprint();
+ card_unmask_view_ = card_unmask_view;
card_ = card;
delegate_ = delegate;
- card_unmask_view_ = CreateAndShowView();
+ card_unmask_view_->Show();
unmasking_result_ = AutofillClient::NONE;
unmasking_number_of_attempts_ = 0;
unmasking_initial_should_store_pan_ = GetStoreLocallyStartState();
@@ -167,15 +166,14 @@ CardUnmaskPromptControllerImpl::GetCloseReasonEvent() {
if (unmasking_result_ == AutofillClient::SUCCESS) {
return unmasking_number_of_attempts_ == 1
- ? AutofillMetrics::UNMASK_PROMPT_UNMASKED_CARD_FIRST_ATTEMPT
- : AutofillMetrics::
- UNMASK_PROMPT_UNMASKED_CARD_AFTER_FAILED_ATTEMPTS;
+ ? AutofillMetrics::UNMASK_PROMPT_UNMASKED_CARD_FIRST_ATTEMPT
+ : AutofillMetrics::UNMASK_PROMPT_UNMASKED_CARD_AFTER_FAILED_ATTEMPTS;
} else {
return AllowsRetry(unmasking_result_)
- ? AutofillMetrics::
- UNMASK_PROMPT_CLOSED_FAILED_TO_UNMASK_RETRIABLE_FAILURE
- : AutofillMetrics::
- UNMASK_PROMPT_CLOSED_FAILED_TO_UNMASK_NON_RETRIABLE_FAILURE;
+ ? AutofillMetrics::
+ UNMASK_PROMPT_CLOSED_FAILED_TO_UNMASK_RETRIABLE_FAILURE
+ : AutofillMetrics::
+ UNMASK_PROMPT_CLOSED_FAILED_TO_UNMASK_NON_RETRIABLE_FAILURE;
}
}
@@ -214,10 +212,6 @@ void CardUnmaskPromptControllerImpl::NewCardLinkClicked() {
new_card_link_clicked_ = true;
}
-content::WebContents* CardUnmaskPromptControllerImpl::GetWebContents() {
- return web_contents_;
-}
-
base::string16 CardUnmaskPromptControllerImpl::GetWindowTitle() const {
int ids = ShouldRequestExpirationDate()
? IDS_AUTOFILL_CARD_UNMASK_PROMPT_UPDATE_TITLE
@@ -309,10 +303,6 @@ base::TimeDelta CardUnmaskPromptControllerImpl::GetSuccessMessageDuration()
return base::TimeDelta::FromMilliseconds(500);
}
-CardUnmaskPromptView* CardUnmaskPromptControllerImpl::CreateAndShowView() {
- return CardUnmaskPromptView::CreateAndShow(this);
-}
-
void CardUnmaskPromptControllerImpl::LoadRiskFingerprint() {
risk_data_callback_.Run(
base::Bind(&CardUnmaskPromptControllerImpl::OnDidLoadRiskFingerprint,

Powered by Google App Engine
This is Rietveld 408576698