Mac: Autofill should not immediately request access to address book.

components/autofill/core/browser/autofill_manager.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_manager.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <map>
@@ skipping 222 matching lines @@
   // work if the delegate has a pointer to the AutofillManager, but
   // future directions may not need such a pointer.
   external_delegate_ = delegate;
   autocomplete_history_manager_->SetExternalDelegate(delegate);
 }
 
 void AutofillManager::ShowAutofillSettings() {
   manager_delegate_->ShowAutofillSettings();
 }
 
+#if defined(OS_MACOSX)
+bool AutofillManager::ShouldShowAccessAddressBookSuggestion(
+    const FormData& form,
+    const FormFieldData& field) {
+  if (!personal_data_)
+    return false;
+  FormStructure* form_structure = NULL;
+  AutofillField* autofill_field = NULL;
+  if (!GetCachedFormAndField(form, field, &form_structure, &autofill_field))
+    return false;
+
+  return personal_data_->ShouldShowAccessAddressBookSuggestion(
+      autofill_field->Type());
+}
+
+bool AutofillManager::AccessAddressBook() {
+  if (!personal_data_)
+    return false;
+  return personal_data_->AccessAddressBook();
+}
+#endif  // defined(OS_MACOSX)
+
 bool AutofillManager::OnFormSubmitted(const FormData& form,
                                       const TimeTicks& timestamp) {
   if (!IsValidFormData(form))
     return false;
 
   // Let Autocomplete know as well.
   autocomplete_history_manager_->OnFormSubmitted(form);
 
   // Grab a copy of the form data.
   scoped_ptr<FormStructure> submitted_form(new FormStructure(form));
@@ skipping 332 matching lines @@
   metric_logger_->LogUserHappinessMetric(AutofillMetrics::USER_DID_AUTOFILL);
   if (!user_did_autofill_) {
     user_did_autofill_ = true;
     metric_logger_->LogUserHappinessMetric(
         AutofillMetrics::USER_DID_AUTOFILL_ONCE);
   }
 
   UpdateInitialInteractionTimestamp(timestamp);
 }
 
+void AutofillManager::OnPingAck() {
+  external_delegate_->OnPingAck();
+}
+
 void AutofillManager::DidShowSuggestions(bool is_new_popup) {
   if (test_delegate_)
     test_delegate_->DidShowSuggestions();
 
   if (is_new_popup) {
     metric_logger_->LogUserHappinessMetric(AutofillMetrics::SUGGESTIONS_SHOWN);
 
     if (!did_show_suggestions_) {
       did_show_suggestions_ = true;
       metric_logger_->LogUserHappinessMetric(
@@ skipping 533 matching lines @@
     return false;
 
   // Disregard forms that we wouldn't ever autofill in the first place.
   if (!form.ShouldBeParsed(true))
     return false;
 
   return true;
 }
 
 }  // namespace autofill