mac: Don't show "Access Address Book" prompt if Autofill is disabled.

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 267 matching lines @@
 }
 
 void AutofillManager::ShowAutofillSettings() {
   client_->ShowAutofillSettings();
 }
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 bool AutofillManager::ShouldShowAccessAddressBookSuggestion(
     const FormData& form,
     const FormFieldData& field) {
-  if (!personal_data_)
+  if (!personal_data_ || !field.should_autocomplete)
     return false;
+

[Ilya Sherman, 2014/08/28 18:40:49]

We still shouldn't be showing these suggestions for forms that are not
autofillable.  Are you planning to implement that change in a follow-up CL?

[erikchen, 2014/08/28 20:57:34]

Added the check.

   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() {
@@ skipping 921 matching lines @@
     return false;
 
   // Disregard forms that we wouldn't ever autofill in the first place.
   if (!form.ShouldBeParsed())
     return false;
 
   return true;
 }
 
 }  // namespace autofill