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

Side by Side Diff: chrome/browser/autofill/autofill_cc_infobar_delegate.cc

Issue 780423002: Don't deref stale AutofillMetrics pointer in AutofillCCInfoBarDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: static-ify 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 "chrome/browser/autofill/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 "chrome/browser/infobars/infobar_service.h"
9 #include "chrome/grit/generated_resources.h" 9 #include "chrome/grit/generated_resources.h"
10 #include "chrome/grit/google_chrome_strings.h" 10 #include "chrome/grit/google_chrome_strings.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 "content/public/browser/page_navigator.h"
16 #include "content/public/browser/web_contents.h" 16 #include "content/public/browser/web_contents.h"
17 #include "content/public/browser/web_contents_delegate.h" 17 #include "content/public/browser/web_contents_delegate.h"
18 #include "grit/components_strings.h" 18 #include "grit/components_strings.h"
19 #include "grit/theme_resources.h" 19 #include "grit/theme_resources.h"
20 #include "ui/base/l10n/l10n_util.h" 20 #include "ui/base/l10n/l10n_util.h"
21 21
22 namespace autofill { 22 namespace autofill {
23 23
24 // static 24 // static
25 void AutofillCCInfoBarDelegate::Create( 25 void AutofillCCInfoBarDelegate::Create(
26 InfoBarService* infobar_service, 26 InfoBarService* infobar_service,
27 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_service->AddInfoBar(
30 scoped_ptr<ConfirmInfoBarDelegate>(new AutofillCCInfoBarDelegate( 29 ConfirmInfoBarDelegate::CreateInfoBar(scoped_ptr<ConfirmInfoBarDelegate>(
31 metric_logger, save_card_callback)))); 30 new AutofillCCInfoBarDelegate(save_card_callback))));
32 } 31 }
33 32
34 AutofillCCInfoBarDelegate::AutofillCCInfoBarDelegate( 33 AutofillCCInfoBarDelegate::AutofillCCInfoBarDelegate(
35 const AutofillMetrics* metric_logger,
36 const base::Closure& save_card_callback) 34 const base::Closure& save_card_callback)
37 : ConfirmInfoBarDelegate(), 35 : ConfirmInfoBarDelegate(),
38 metric_logger_(metric_logger),
39 save_card_callback_(save_card_callback), 36 save_card_callback_(save_card_callback),
40 had_user_interaction_(false) { 37 had_user_interaction_(false) {
41 metric_logger->LogCreditCardInfoBarMetric(AutofillMetrics::INFOBAR_SHOWN); 38 AutofillMetrics::LogCreditCardInfoBarMetric(AutofillMetrics::INFOBAR_SHOWN);
42 } 39 }
43 40
44 AutofillCCInfoBarDelegate::~AutofillCCInfoBarDelegate() { 41 AutofillCCInfoBarDelegate::~AutofillCCInfoBarDelegate() {
45 if (!had_user_interaction_) 42 if (!had_user_interaction_)
46 LogUserAction(AutofillMetrics::INFOBAR_IGNORED); 43 LogUserAction(AutofillMetrics::INFOBAR_IGNORED);
47 } 44 }
48 45
49 void AutofillCCInfoBarDelegate::LogUserAction( 46 void AutofillCCInfoBarDelegate::LogUserAction(
50 AutofillMetrics::InfoBarMetric user_action) { 47 AutofillMetrics::InfoBarMetric user_action) {
51 DCHECK(!had_user_interaction_); 48 DCHECK(!had_user_interaction_);
52 49
53 metric_logger_->LogCreditCardInfoBarMetric(user_action); 50 AutofillMetrics::LogCreditCardInfoBarMetric(user_action);
54 had_user_interaction_ = true; 51 had_user_interaction_ = true;
55 } 52 }
56 53
57 void AutofillCCInfoBarDelegate::InfoBarDismissed() { 54 void AutofillCCInfoBarDelegate::InfoBarDismissed() {
58 LogUserAction(AutofillMetrics::INFOBAR_DENIED); 55 LogUserAction(AutofillMetrics::INFOBAR_DENIED);
59 } 56 }
60 57
61 int AutofillCCInfoBarDelegate::GetIconID() const { 58 int AutofillCCInfoBarDelegate::GetIconID() const {
62 return IDR_INFOBAR_AUTOFILL_CC; 59 return IDR_INFOBAR_AUTOFILL_CC;
63 } 60 }
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 bool AutofillCCInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) { 101 bool AutofillCCInfoBarDelegate::LinkClicked(WindowOpenDisposition disposition) {
105 InfoBarService::WebContentsFromInfoBar(infobar())->OpenURL( 102 InfoBarService::WebContentsFromInfoBar(infobar())->OpenURL(
106 content::OpenURLParams( 103 content::OpenURLParams(
107 GURL(autofill::kHelpURL), content::Referrer(), 104 GURL(autofill::kHelpURL), content::Referrer(),
108 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition, 105 (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
109 ui::PAGE_TRANSITION_LINK, false)); 106 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