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

Unified Diff: components/autofill/content/browser/autofill_cc_infobar_delegate.cc

Issue 710453002: [Autofill] Componentize AutofillCCInfoBarDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Abstracting the call to WebContents::OpenURL() throuh the AutofillDriver. Created 6 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 side-by-side diff with in-line comments
Download patch
Index: components/autofill/content/browser/autofill_cc_infobar_delegate.cc
diff --git a/chrome/browser/autofill/autofill_cc_infobar_delegate.cc b/components/autofill/content/browser/autofill_cc_infobar_delegate.cc
similarity index 75%
rename from chrome/browser/autofill/autofill_cc_infobar_delegate.cc
rename to components/autofill/content/browser/autofill_cc_infobar_delegate.cc
index f2fd9ea8d0e636e17b3b0e6409ad247c578504f4..162f72ad538dbdd7c9c2490cd8dea8bf93228dcf 100644
--- a/chrome/browser/autofill/autofill_cc_infobar_delegate.cc
+++ b/components/autofill/content/browser/autofill_cc_infobar_delegate.cc
@@ -2,39 +2,38 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
+#include "components/autofill/content/browser/autofill_cc_infobar_delegate.h"
#include "base/logging.h"
-#include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/grit/generated_resources.h"
-#include "chrome/grit/google_chrome_strings.h"
+#include "components/autofill/core/browser/autofill_driver.h"
#include "components/autofill/core/browser/credit_card.h"
#include "components/autofill/core/browser/personal_data_manager.h"
#include "components/autofill/core/common/autofill_constants.h"
#include "components/infobars/core/infobar.h"
-#include "content/public/browser/page_navigator.h"
-#include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_delegate.h"
+#include "components/infobars/core/infobar_manager.h"
+#include "grit/components_scaled_resources.h"
#include "grit/components_strings.h"
-#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"
namespace autofill {
// static
void AutofillCCInfoBarDelegate::Create(
- InfoBarService* infobar_service,
+ infobars::InfoBarManager* infobar_manager,
+ const AutofillDriver* autofill_driver,
const AutofillMetrics* metric_logger,
const base::Closure& save_card_callback) {
- infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
+ infobar_manager->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
scoped_ptr<ConfirmInfoBarDelegate>(new AutofillCCInfoBarDelegate(
- metric_logger, save_card_callback))));
+ autofill_driver, metric_logger, save_card_callback))));
}
AutofillCCInfoBarDelegate::AutofillCCInfoBarDelegate(
+ const AutofillDriver* autofill_driver,
const AutofillMetrics* metric_logger,
const base::Closure& save_card_callback)
: ConfirmInfoBarDelegate(),
+ autofill_driver_(autofill_driver),
metric_logger_(metric_logger),
save_card_callback_(save_card_callback),
had_user_interaction_(false) {
@@ -81,8 +80,9 @@ base::string16 AutofillCCInfoBarDelegate::GetMessageText() const {
base::string16 AutofillCCInfoBarDelegate::GetButtonLabel(
InfoBarButton button) const {
- return l10n_util::GetStringUTF16((button == BUTTON_OK) ?
- IDS_AUTOFILL_CC_INFOBAR_ACCEPT : IDS_AUTOFILL_CC_INFOBAR_DENY);
+ return l10n_util::GetStringUTF16((button == BUTTON_OK)
+ ? IDS_AUTOFILL_CC_INFOBAR_ACCEPT
+ : IDS_AUTOFILL_CC_INFOBAR_DENY);
Peter Kasting 2014/11/21 19:42:17 Nit: Please leave this formatting as it was before
Pritam Nikam 2014/11/24 14:45:53 Done. "git cl format" would have disturbed the for
}
bool AutofillCCInfoBarDelegate::Accept() {
@@ -102,11 +102,7 @@ base::string16 AutofillCCInfoBarDelegate::GetLinkText() const {
}
bool AutofillCCInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
- InfoBarService::WebContentsFromInfoBar(infobar())->OpenURL(
- content::OpenURLParams(
- GURL(autofill::kHelpURL), content::Referrer(),
- (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
- ui::PAGE_TRANSITION_LINK, false));
+ autofill_driver_->LinkClicked(disposition);
return false;
}

Powered by Google App Engine
This is Rietveld 408576698