Index: chrome/browser/ui/views/passwords/credentials_selection_view.cc |
diff --git a/chrome/browser/ui/views/passwords/credentials_selection_view.cc b/chrome/browser/ui/views/passwords/credentials_selection_view.cc |
index 483b731ee5dcac1a3ed7b51204b700685215926a..f1328e60a824c4fb26a58f5d58155a4be00201b8 100644 |
--- a/chrome/browser/ui/views/passwords/credentials_selection_view.cc |
+++ b/chrome/browser/ui/views/passwords/credentials_selection_view.cc |
@@ -7,6 +7,7 @@ |
#include <stddef.h> |
#include "chrome/browser/ui/passwords/manage_passwords_bubble_model.h" |
+#include "components/password_manager/core/browser/password_manager_metrics_util.h" |
#include "ui/base/models/simple_combobox_model.h" |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/views/controls/button/button.h" |
@@ -26,7 +27,9 @@ views::Label* GeneratePasswordLabel(const autofill::PasswordForm& form) { |
return label; |
} |
-views::Combobox* GenerateUsernameCombobox( |
+} // namespace |
+ |
+views::Combobox* CredentialsSelectionView::GenerateUsernameCombobox( |
vasilii
2016/01/13 15:23:46
The definition order should match the declaration
dvadym
2016/01/13 15:39:56
Done.
|
const std::vector<const autofill::PasswordForm*>& forms, |
const base::string16& best_matched_username) { |
std::vector<base::string16> usernames; |
@@ -45,21 +48,28 @@ views::Combobox* GenerateUsernameCombobox( |
views::Combobox* combobox = |
new views::Combobox(new ui::SimpleComboboxModel(usernames)); |
+ default_index_ = 0; |
+ is_default_best_match_ = false; |
+ is_default_preferred_ = false; |
+ |
if (best_matched_username_index < forms.size()) { |
+ is_default_best_match_ = true; |
+ default_index_ = best_matched_username_index; |
combobox->SetSelectedIndex(best_matched_username_index); |
} else if (preferred_form_index < forms.size()) { |
+ is_default_preferred_ = true; |
+ default_index_ = preferred_form_index; |
combobox->SetSelectedIndex(preferred_form_index); |
} |
return combobox; |
} |
-} // namespace |
- |
CredentialsSelectionView::CredentialsSelectionView( |
ManagePasswordsBubbleModel* manage_passwords_bubble_model, |
const std::vector<const autofill::PasswordForm*>& password_forms, |
const base::string16& best_matched_username) |
- : password_forms_(password_forms) { |
+ : password_forms_(password_forms), |
+ action_reported_(false) { |
DCHECK(!password_forms.empty()); |
// Layout. |
@@ -90,9 +100,58 @@ CredentialsSelectionView::CredentialsSelectionView( |
GetLayoutManager()->Layout(this); |
} |
+CredentialsSelectionView::~CredentialsSelectionView() { |
+ ReportUserActionOnce(true, -1); |
+} |
+ |
const autofill::PasswordForm* |
CredentialsSelectionView::GetSelectedCredentials() { |
DCHECK_EQ(password_forms_.size(), |
static_cast<size_t>(combobox_->model()->GetItemCount())); |
+ ReportUserActionOnce(false, combobox_->selected_index()); |
return password_forms_[combobox_->selected_index()]; |
} |
+ |
+void CredentialsSelectionView::ReportUserActionOnce(bool was_update_rejected_, |
+ int selected_index) { |
vasilii
2016/01/13 15:23:46
indent
dvadym
2016/01/13 15:39:56
Done.
|
+ if (action_reported_) |
+ return; |
+ password_manager::metrics_util::MultiAccountUpdateBubbleUserAction action; |
+ if (was_update_rejected_) { |
+ if (is_default_best_match_) { |
+ action = password_manager::metrics_util:: |
+ DEFAULT_ACCOUNT_MATCHED_BY_PASSWORD_USER_REJECTED_UPDATE; |
+ } else if (is_default_preferred_) { |
+ action = password_manager::metrics_util:: |
+ DEFAULT_ACCOUNT_PREFERRED_USER_REJECTED_UPDATE; |
+ } else { |
+ action = password_manager::metrics_util:: |
+ DEFAULT_ACCOUNT_FIRST_USER_REJECTED_UPDATE; |
+ } |
+ } else if (selected_index == default_index_) { |
+ if (is_default_best_match_) { |
+ action = password_manager::metrics_util:: |
+ DEFAULT_ACCOUNT_MATCHED_BY_PASSWORD_USER_NOT_CHANGED; |
+ } else if (is_default_preferred_) { |
+ action = password_manager::metrics_util:: |
+ DEFAULT_ACCOUNT_PREFERRED_USER_NOT_CHANGED; |
+ } else { |
+ action = password_manager::metrics_util:: |
+ DEFAULT_ACCOUNT_FIRST_USER_NOT_CHANGED; |
+ } |
+ } else { |
+ if (is_default_best_match_) { |
+ action = password_manager::metrics_util:: |
+ DEFAULT_ACCOUNT_MATCHED_BY_PASSWORD_USER_CHANGED; |
+ } else if (is_default_preferred_) { |
+ action = password_manager::metrics_util:: |
+ DEFAULT_ACCOUNT_PREFERRED_USER_CHANGED; |
+ } else { |
+ action = |
+ password_manager::metrics_util::DEFAULT_ACCOUNT_FIRST_USER_CHANGED; |
+ } |
+ } |
+ |
+ password_manager::metrics_util::LogMultiAccountUpdateBubbleUserAction(action); |
+ action_reported_ = true; |
+} |