mac: Only show the access Address Book prompt a fixed number of times.

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"
@@ skipping 31 matching lines @@
 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),
-      weak_ptr_factory_(this) {
+      weak_ptr_factory_(this),
+      has_shown_address_book_prompt(false) {
   DCHECK(manager);
 }
 
 AutofillExternalDelegate::~AutofillExternalDelegate() {}
 
 void AutofillExternalDelegate::OnQuery(int query_id,
                                        const FormData& form,
                                        const FormFieldData& field,
                                        const gfx::RectF& element_bounds,
                                        bool display_warning_if_disabled) {
+  if (query_form_ != form)
+    has_shown_address_book_prompt = false;
+
   query_form_ = form;
   query_field_ = field;
   display_warning_if_disabled_ = display_warning_if_disabled;
   query_id_ = query_id;
   element_bounds_ = element_bounds;
 }
 
 void AutofillExternalDelegate::OnSuggestionsReturned(
     int query_id,
     const std::vector<base::string16>& suggested_values,
@@ skipping 37 matching lines @@
     labels.pop_back();
     icons.pop_back();
     ids.pop_back();
   }
 
   // If anything else is added to modify the values after inserting the data
   // list, AutofillPopupControllerImpl::UpdateDataListValues will need to be
   // updated to match.
   InsertDataListValues(&values, &labels, &icons, &ids);
 
-// Temporarily disabled. See http://crbug.com/408695
-#if 0
 #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::ASCIIToUTF16("macContactsIcon"));
     ids.push_back(POPUP_ITEM_ID_MAC_ACCESS_CONTACTS);
 
-    EmitHistogram(SHOWED_ACCESS_ADDRESS_BOOK_ENTRY);
+    if (!has_shown_address_book_prompt) {
+      has_shown_address_book_prompt = true;
+      EmitHistogram(SHOWED_ACCESS_ADDRESS_BOOK_ENTRY);
+      manager_->ShowedAccessAddressBookPrompt();
+    }
   }
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
-#endif
 
   if (values.empty()) {
     // No suggestions, any popup currently showing is obsolete.
     manager_->client()->HideAutofillPopup();
     return;
   }
 
   // Send to display.
   if (query_field_.is_focusable) {
     manager_->client()->ShowAutofillPopup(element_bounds_,
@@ skipping 48 matching lines @@
   } 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)
     EmitHistogram(SELECTED_ACCESS_ADDRESS_BOOK_ENTRY);
+    LOCAL_HISTOGRAM_ENUMERATION("Autofill.MacAddressBook.ShowedCount",

[Evan Stade, 2014/09/18 22:06:09]

instead of ShowedCount, how about NumShowsBeforeSelected?

[erikchen, 2014/09/18 22:49:50]

Done.

+                                manager_->AccessAddressBookPromptCount(),
+                                30);

[erikchen, 2014/09/18 21:55:58]

This number is intentionally larger than 5, and also intentionally independent.

 
     // 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
@@ skipping 178 matching lines @@
                      POPUP_ITEM_ID_DATALIST_ENTRY);
 }
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 void AutofillExternalDelegate::PingRenderer() {
   driver_->PingRenderer();
 }
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 
 }  // namespace autofill