mac: Clean up autofill integration with Address Book.

components/autofill/core/browser/personal_data_manager_mac.mm

 // 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/personal_data_manager.h"
 
 #include <math.h>
 
 #import <AddressBook/AddressBook.h>
 
@@ skipping 19 matching lines @@
 
 namespace autofill {
 namespace {
 
 const char kAddressBookOrigin[] = "OS X Address Book";
 
 // Whether Chrome has prompted the user for permission to access the user's
 // address book.
 bool HasPromptedForAccessToAddressBook(PrefService* pref_service) {
   return pref_service->GetBoolean(prefs::kAutofillAuxiliaryProfilesQueried);
 }

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

nit: Please leave a blank line after this one.

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

Done.

+// Whether the user wants Chrome to use the AddressBook to populate autofill
+// entries.
+bool ShouldUseAddressBook(PrefService* pref_service) {
+  return pref_service->GetBoolean(prefs::kAutofillUseMacAddressBook);
+}
 
 ABAddressBook* GetAddressBook(PrefService* pref_service) {
   bool first_access = !HasPromptedForAccessToAddressBook(pref_service);
 
   // +[ABAddressBook sharedAddressBook] throws an exception internally in
   // circumstances that aren't clear. The exceptions are only observed in crash
   // reports, so it is unknown whether they would be caught by AppKit and nil
   // returned, or if they would take down the app. In either case, avoid
   // crashing. http://crbug.com/129022
   ABAddressBook* addressBook = base::mac::RunBlockIgnoringExceptions(
@@ skipping 52 matching lines @@
 };
 
 // This method uses the |ABAddressBook| system service to fetch the "me" card
 // from the active user's address book.  It looks for the user address
 // information and translates it to the internal list of |AutofillProfile| data
 // structures.
 void AuxiliaryProfilesImpl::GetAddressBookMeCard(const std::string& app_locale,
                                                  PrefService* pref_service) {
   profiles_.clear();
 
-  // Chrome has not yet requested address book permissions. Attempting to do so
-  // presents a blocking modal dialog, which is undesirable. Instead, just show
-  // no results.
-  if (!HasPromptedForAccessToAddressBook(pref_service))
+  // The user does not want Chrome to use the AddressBook to populate autofill
+  // entries.
+  if (!ShouldUseAddressBook(pref_service))
     return;
 
   ABAddressBook* addressBook = GetAddressBook(pref_service);
 
   ABPerson* me = [addressBook me];
   if (!me)
     return;
 
   ABMultiValue* addresses = [me valueForProperty:kABAddressProperty];
 
@@ skipping 170 matching lines @@
 
 }  // namespace
 
 // Populate |auxiliary_profiles_| with the Address Book data.
 void PersonalDataManager::LoadAuxiliaryProfiles() const {
   AuxiliaryProfilesImpl impl(&auxiliary_profiles_);
   impl.GetAddressBookMeCard(app_locale_, pref_service_);
 }
 
 bool PersonalDataManager::AccessAddressBook() {
-  if (!pref_service_->GetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled))
-    return false;
-
-  if (HasPromptedForAccessToAddressBook(pref_service_))
-    return false;
+  // The user is attempting to give Chrome access to the user's Address Book.
+  // This implicitly acknowledges that the user wants to use auxiliary
+  // profiles.
+  pref_service_->SetBoolean(prefs::kAutofillUseMacAddressBook, true);

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

I've intentionally removed the check against the pref for
HasPromptedForAccessToAddressBook, as it is theoretically possible for the user
to manually modify his prefs to change that value. If for some reason the pref
is out of sync, then calling GetAddressBook will not present a blocking dialog,
and the pref will be updated.

 
   // Request permissions.
   GetAddressBook(pref_service_);
   return true;
 }
 
 bool PersonalDataManager::ShouldShowAccessAddressBookSuggestion(
     AutofillType type) {
-  if (!pref_service_->GetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled))
-    return false;
-
   if (HasPromptedForAccessToAddressBook(pref_service_))
     return false;
 
   switch (type.group()) {
     case ADDRESS_BILLING:
     case ADDRESS_HOME:
     case EMAIL:
     case NAME:
     case NAME_BILLING:
     case PHONE_BILLING:
     case PHONE_HOME:
       return true;
     case NO_GROUP:
     case COMPANY:
     case CREDIT_CARD:
     case PASSWORD_FIELD:
       return false;
   }
 
   return false;
 }
 
 }  // namespace autofill