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

Side by Side Diff: components/autofill/core/browser/autofill_cc_infobar_delegate.cc

Issue 710453002: [Autofill] Componentize AutofillCCInfoBarDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Return nullptr for CreateInfoBar() in test_autofill_client.cc. Created 6 years 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "chrome/browser/autofill/autofill_cc_infobar_delegate.h" 5 #include "components/autofill/core/browser/autofill_cc_infobar_delegate.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/infobars/infobar_service.h" 8 #include "components/autofill/core/browser/autofill_client.h"
9 #include "chrome/grit/generated_resources.h" 9 #include "components/autofill/core/browser/autofill_driver.h"
10 #include "chrome/grit/google_chrome_strings.h" 10 #include "components/autofill/core/browser/autofill_manager.h"
11 #include "components/autofill/core/browser/credit_card.h" 11 #include "components/autofill/core/browser/credit_card.h"
12 #include "components/autofill/core/browser/personal_data_manager.h" 12 #include "components/autofill/core/browser/personal_data_manager.h"
13 #include "components/autofill/core/common/autofill_constants.h" 13 #include "components/autofill/core/common/autofill_constants.h"
14 #include "components/infobars/core/infobar.h" 14 #include "components/infobars/core/infobar.h"
15 #include "content/public/browser/page_navigator.h" 15 #include "components/infobars/core/infobar_manager.h"
16 #include "content/public/browser/web_contents.h" 16 #include "grit/components_scaled_resources.h"
17 #include "content/public/browser/web_contents_delegate.h"
18 #include "grit/components_strings.h" 17 #include "grit/components_strings.h"
19 #include "grit/theme_resources.h"
20 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
21 19
22 namespace autofill { 20 namespace autofill {
23 21
24 // static 22 // static
25 void AutofillCCInfoBarDelegate::Create( 23 void AutofillCCInfoBarDelegate::Create(
26 InfoBarService* infobar_service, 24 infobars::InfoBarManager* infobar_manager,
25 AutofillManager* autofill_manager,
Ilya Sherman 2014/12/03 20:00:21 Can you pass the driver directly, rather than pass
Pritam Nikam 2014/12/04 15:37:30 In that case, I have to pass both AutofillClient a
27 const AutofillMetrics* metric_logger, 26 const AutofillMetrics* metric_logger,
28 const base::Closure& save_card_callback) { 27 const base::Closure& save_card_callback) {
29 infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar( 28 infobar_manager->AddInfoBar(autofill_manager->client()->CreateInfoBar(
30 scoped_ptr<ConfirmInfoBarDelegate>(new AutofillCCInfoBarDelegate( 29 scoped_ptr<ConfirmInfoBarDelegate>(new AutofillCCInfoBarDelegate(
31 metric_logger, save_card_callback)))); 30 autofill_manager->driver(), metric_logger, save_card_callback))));
32 } 31 }
33 32
34 AutofillCCInfoBarDelegate::AutofillCCInfoBarDelegate( 33 AutofillCCInfoBarDelegate::AutofillCCInfoBarDelegate(
34 AutofillDriver* autofill_driver,
35 const AutofillMetrics* metric_logger, 35 const AutofillMetrics* metric_logger,
36 const base::Closure& save_card_callback) 36 const base::Closure& save_card_callback)
37 : ConfirmInfoBarDelegate(), 37 : ConfirmInfoBarDelegate(),
38 autofill_driver_(autofill_driver),
38 metric_logger_(metric_logger), 39 metric_logger_(metric_logger),
39 save_card_callback_(save_card_callback), 40 save_card_callback_(save_card_callback),
40 had_user_interaction_(false) { 41 had_user_interaction_(false) {
41 metric_logger->LogCreditCardInfoBarMetric(AutofillMetrics::INFOBAR_SHOWN); 42 metric_logger->LogCreditCardInfoBarMetric(AutofillMetrics::INFOBAR_SHOWN);
42 } 43 }
43 44
44 AutofillCCInfoBarDelegate::~AutofillCCInfoBarDelegate() { 45 AutofillCCInfoBarDelegate::~AutofillCCInfoBarDelegate() {
45 if (!had_user_interaction_) 46 if (!had_user_interaction_)
46 LogUserAction(AutofillMetrics::INFOBAR_IGNORED); 47 LogUserAction(AutofillMetrics::INFOBAR_IGNORED);
47 } 48 }
(...skipping 27 matching lines...) Expand all
75 return false; 76 return false;
76 } 77 }
77 78
78 base::string16 AutofillCCInfoBarDelegate::GetMessageText() const { 79 base::string16 AutofillCCInfoBarDelegate::GetMessageText() const {
79 return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_INFOBAR_TEXT); 80 return l10n_util::GetStringUTF16(IDS_AUTOFILL_CC_INFOBAR_TEXT);
80 } 81 }
81 82
82 base::string16 AutofillCCInfoBarDelegate::GetButtonLabel( 83 base::string16 AutofillCCInfoBarDelegate::GetButtonLabel(
83 InfoBarButton button) const { 84 InfoBarButton button) const {
84 return l10n_util::GetStringUTF16((button == BUTTON_OK) ? 85 return l10n_util::GetStringUTF16((button == BUTTON_OK) ?
85 IDS_AUTOFILL_CC_INFOBAR_ACCEPT : IDS_AUTOFILL_CC_INFOBAR_DENY); 86 IDS_AUTOFILL_CC_INFOBAR_ACCEPT : IDS_AUTOFILL_CC_INFOBAR_DENY);
Ilya Sherman 2014/12/03 20:00:20 Hmm, this formatting change looks wrong -- is this
Pritam Nikam 2014/12/04 15:37:30 Done. on "git cl format" return l10n_util::Get
86 } 87 }
87 88
88 bool AutofillCCInfoBarDelegate::Accept() { 89 bool AutofillCCInfoBarDelegate::Accept() {
89 save_card_callback_.Run(); 90 save_card_callback_.Run();
90 save_card_callback_.Reset(); 91 save_card_callback_.Reset();
91 LogUserAction(AutofillMetrics::INFOBAR_ACCEPTED); 92 LogUserAction(AutofillMetrics::INFOBAR_ACCEPTED);
92 return true; 93 return true;
93 } 94 }
94 95
95 bool AutofillCCInfoBarDelegate::Cancel() { 96 bool AutofillCCInfoBarDelegate::Cancel() {
96 LogUserAction(AutofillMetrics::INFOBAR_DENIED); 97 LogUserAction(AutofillMetrics::INFOBAR_DENIED);
97 return true; 98 return true;
98 } 99 }
99 100
100 base::string16 AutofillCCInfoBarDelegate::GetLinkText() const { 101 base::string16 AutofillCCInfoBarDelegate::GetLinkText() const {
101 return l10n_util::GetStringUTF16(IDS_LEARN_MORE); 102 return l10n_util::GetStringUTF16(IDS_LEARN_MORE);
102 } 103 }
103 104
104 bool AutofillCCInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) { 105 bool AutofillCCInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
105 InfoBarService::WebContentsFromInfoBar(infobar())->OpenURL( 106 autofill_driver_->LinkClicked(GURL(autofill::kHelpURL), disposition);
Ilya Sherman 2014/12/03 20:00:20 You've dropped the code that sets the disposition.
Pritam Nikam 2014/12/04 15:37:30 Done.
106 content::OpenURLParams(
107 GURL(autofill::kHelpURL), content::Referrer(),
108 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
109 ui::PAGE_TRANSITION_LINK, false));
110 return false; 107 return false;
111 } 108 }
112 109
113 } // namespace autofill 110 } // namespace autofill
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698