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/user_metrics.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"
 
 namespace autofill {
 
@@ skipping 73 matching lines @@
   // updated to match.
   InsertDataListValues(&values, &labels, &icons, &ids);
 
 #if defined(OS_MACOSX)
   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);
+
+    base::RecordAction(base::UserMetricsAction(
+        "Autofill_Showed_Access_Mac_Address_Book_Entry"));

[Ilya Sherman, 2014/05/30 23:39:48]

Please use an enumerated histogram rather than a user action.  Also, FYI, user
action names do not typically have so many underscores in them.

[erikchen, 2014/06/02 21:21:17]

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)
+    base::RecordAction(base::UserMetricsAction(
+        "Autofill_Selected_Access_Mac_Address_Book_Entry"));
+
     // 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)
 void AutofillExternalDelegate::PingRenderer() {
   driver_->PingRenderer();
 }
 #endif
 
 }  // namespace autofill