mac: Clean up autofill integration with Address Book.

components/autofill/core/browser/autofill_external_delegate.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/autofill/core/browser/autofill_external_delegate.h"
 
 #include "base/message_loop/message_loop.h"
+#include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autocomplete_history_manager.h"
 #include "components/autofill/core/browser/autofill_driver.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+namespace {
+
+enum AccessAddressBookEventType {
+  // An autofill entry was shown that prompts the user to give Chrome access to

[Ilya Sherman, 2014/06/02 22:54:27]

nit: "autofill" -> "Autofill"

[erikchen, 2014/06/03 01:34:19]

I've gone through the CL and replaced all instances of "autofill" in a comment
with "Autofill".

+  // the user's Address Book.
+  SHOWED_ACCESS_AB_ENTRY = 0,

[Ilya Sherman, 2014/06/02 22:54:27]

nit: "AB" -> "ADDRESS_BOOK"

[erikchen, 2014/06/03 01:34:19]

Done.

+
+  // The user selected the autofill entry which prompts Chrome to access the
+  // user's Address Book.
+  SELECTED_ACCESS_AB_ENTRY,
+
+  // Always keep this at the end.
+  ACCESS_AB_ENTRY_MAX,
+};
+
+}  // namespace
+#endif
+
 namespace autofill {
 
 AutofillExternalDelegate::AutofillExternalDelegate(AutofillManager* manager,
                                                    AutofillDriver* driver)
     : manager_(manager),
       driver_(driver),
       query_id_(0),
       display_warning_if_disabled_(false),
       has_suggestion_(false),
       has_shown_popup_for_current_edit_(false),
@@ skipping 65 matching lines @@
   // updated to match.
   InsertDataListValues(&values, &labels, &icons, &ids);
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   if (values.empty() &&
       manager_->ShouldShowAccessAddressBookSuggestion(query_form_,
                                                       query_field_)) {
     values.push_back(
         l10n_util::GetStringUTF16(IDS_AUTOFILL_ACCESS_MAC_CONTACTS));
     labels.push_back(base::string16());
-    icons.push_back(base::string16());
+    icons.push_back(base::ASCIIToUTF16("macContactsIcon"));
     ids.push_back(POPUP_ITEM_ID_MAC_ACCESS_CONTACTS);
+
+    UMA_HISTOGRAM_ENUMERATION("Autofill.MacAccessAddressBook",

[Ilya Sherman, 2014/06/02 22:54:27]

Optional nit: I'd drop "Access" from the histogram name, i.e. just
"Autofill.MacAddressBook"

[erikchen, 2014/06/03 01:34:19]

Done.

+                              SHOWED_ACCESS_AB_ENTRY,
+                              ACCESS_AB_ENTRY_MAX);

[Ilya Sherman, 2014/06/02 22:54:27]

nit: Please define a wrapper function for emitting to this histogram, so that
it's hard to accidentally make a typo for just one of the code paths.

[erikchen, 2014/06/03 01:34:19]

Done.

   }
 #endif
 
   if (values.empty()) {
     // No suggestions, any popup currently showing is obsolete.
     manager_->delegate()->HideAutofillPopup();
     return;
   }
 
   // Send to display.
@@ skipping 51 matching lines @@
     driver_->RendererShouldClearFilledForm();
   } else if (identifier == POPUP_ITEM_ID_PASSWORD_ENTRY) {
     NOTREACHED();  // Should be handled elsewhere.
   } else if (identifier == POPUP_ITEM_ID_DATALIST_ENTRY) {
     driver_->RendererShouldAcceptDataListSuggestion(value);
   } else if (identifier == POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY) {
     // User selected an Autocomplete, so we fill directly.
     driver_->RendererShouldFillFieldWithValue(value);
   } else if (identifier == POPUP_ITEM_ID_MAC_ACCESS_CONTACTS) {
 #if defined(OS_MACOSX) && !defined(OS_IOS)
+    UMA_HISTOGRAM_ENUMERATION("Autofill.MacAccessAddressBook",
+                              SELECTED_ACCESS_AB_ENTRY,
+                              ACCESS_AB_ENTRY_MAX);
+
     // User wants to give Chrome access to user's address book.
     manager_->AccessAddressBook();
 
     // There is no deterministic method for deciding whether a blocking dialog
     // was presented. The following comments and code assume that a blocking
     // dialog was presented, but still behave correctly if no dialog was
     // presented.
 
     // A blocking dialog was presented, and the user has already responded to
     // the dialog. The presentation of the dialog added an NSEvent to the
@@ skipping 177 matching lines @@
                      POPUP_ITEM_ID_DATALIST_ENTRY);
 }
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 void AutofillExternalDelegate::PingRenderer() {
   driver_->PingRenderer();
 }
 #endif
 
 }  // namespace autofill