diff options
author | vabr <vabr@chromium.org> | 2016-03-09 06:07:04 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-09 14:08:18 +0000 |
commit | 0090ffb1c2878f85bd94750db07c09448741172b (patch) | |
tree | cd354513c684724eb5b6aa0643a034931ef557f8 /ios/chrome/browser | |
parent | b6e375669d7dadecd6bbb252a56196ecee8843b5 (diff) | |
download | chromium_src-0090ffb1c2878f85bd94750db07c09448741172b.zip chromium_src-0090ffb1c2878f85bd94750db07c09448741172b.tar.gz chromium_src-0090ffb1c2878f85bd94750db07c09448741172b.tar.bz2 |
Use password_manager::metrics_util::ResponseType on iOS
The passwords infobar delegate had a separate copy of the ResponseType enum. So
far it had a subset of values of the desktop version of ResponseType (matching
the positions), so it was not a problem, but to avoid diverging in the future,
this CL switches the iOS code to use the component-defined ResponseType (which
also matches histograms.xml).
R=melandory@chromium.org
BUG=593295
Review URL: https://codereview.chromium.org/1777473004
Cr-Commit-Position: refs/heads/master@{#380132}
Diffstat (limited to 'ios/chrome/browser')
-rw-r--r-- | ios/chrome/browser/passwords/ios_chrome_save_password_infobar_delegate.h | 10 | ||||
-rw-r--r-- | ios/chrome/browser/passwords/ios_chrome_save_password_infobar_delegate.mm | 9 |
2 files changed, 7 insertions, 12 deletions
diff --git a/ios/chrome/browser/passwords/ios_chrome_save_password_infobar_delegate.h b/ios/chrome/browser/passwords/ios_chrome_save_password_infobar_delegate.h index 76cbf33..baf891e 100644 --- a/ios/chrome/browser/passwords/ios_chrome_save_password_infobar_delegate.h +++ b/ios/chrome/browser/passwords/ios_chrome_save_password_infobar_delegate.h @@ -8,6 +8,7 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "components/infobars/core/confirm_infobar_delegate.h" +#include "components/password_manager/core/browser/password_manager_metrics_util.h" namespace password_manager { class PasswordFormManager; @@ -33,13 +34,6 @@ class IOSChromeSavePasswordInfoBarDelegate : public ConfirmInfoBarDelegate { ~IOSChromeSavePasswordInfoBarDelegate() override; private: - enum ResponseType { - NO_RESPONSE = 0, - REMEMBER_PASSWORD, - DO_NOT_REMEMBER_PASSWORD, - NUM_RESPONSE_TYPES, - }; - IOSChromeSavePasswordInfoBarDelegate( bool is_smart_lock_branding_enabled, scoped_ptr<password_manager::PasswordFormManager> form_to_save); @@ -60,7 +54,7 @@ class IOSChromeSavePasswordInfoBarDelegate : public ConfirmInfoBarDelegate { scoped_ptr<password_manager::PasswordFormManager> form_to_save_; // Used to track the results we get from the info bar. - ResponseType infobar_response_; + password_manager::metrics_util::ResponseType infobar_response_; // Whether to show the password manager branded as Smart Lock. bool is_smart_lock_branding_enabled_; diff --git a/ios/chrome/browser/passwords/ios_chrome_save_password_infobar_delegate.mm b/ios/chrome/browser/passwords/ios_chrome_save_password_infobar_delegate.mm index 6724251..67da5c4 100644 --- a/ios/chrome/browser/passwords/ios_chrome_save_password_infobar_delegate.mm +++ b/ios/chrome/browser/passwords/ios_chrome_save_password_infobar_delegate.mm @@ -40,14 +40,15 @@ void IOSChromeSavePasswordInfoBarDelegate::Create( IOSChromeSavePasswordInfoBarDelegate::~IOSChromeSavePasswordInfoBarDelegate() { UMA_HISTOGRAM_ENUMERATION("PasswordManager.InfoBarResponse", - infobar_response_, NUM_RESPONSE_TYPES); + infobar_response_, + password_manager::metrics_util::NUM_RESPONSE_TYPES); } IOSChromeSavePasswordInfoBarDelegate::IOSChromeSavePasswordInfoBarDelegate( bool is_smart_lock_branding_enabled, scoped_ptr<PasswordFormManager> form_to_save) : form_to_save_(std::move(form_to_save)), - infobar_response_(NO_RESPONSE), + infobar_response_(password_manager::metrics_util::NO_RESPONSE), is_smart_lock_branding_enabled_(is_smart_lock_branding_enabled) {} infobars::InfoBarDelegate::Type @@ -85,14 +86,14 @@ base::string16 IOSChromeSavePasswordInfoBarDelegate::GetButtonLabel( bool IOSChromeSavePasswordInfoBarDelegate::Accept() { DCHECK(form_to_save_); form_to_save_->Save(); - infobar_response_ = REMEMBER_PASSWORD; + infobar_response_ = password_manager::metrics_util::REMEMBER_PASSWORD; return true; } bool IOSChromeSavePasswordInfoBarDelegate::Cancel() { DCHECK(form_to_save_); form_to_save_->PermanentlyBlacklist(); - infobar_response_ = DO_NOT_REMEMBER_PASSWORD; + infobar_response_ = password_manager::metrics_util::NEVER_REMEMBER_PASSWORD; return true; } |