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 12 matching lines @@
 #include "components/autofill/core/browser/autocomplete_history_manager.h"
 #include "components/autofill/core/browser/autofill_data_model.h"
 #include "components/autofill/core/browser/autofill_external_delegate.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_manager_delegate.h"
 #include "components/autofill/core/browser/autofill_manager_test_delegate.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
+#include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/phone_number.h"
 #include "components/autofill/core/browser/phone_number_i18n.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/common/autofill_data_validation.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_data_predictions.h"
@@ skipping 190 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::HasPromptedForAccessToAddressBook() {
+  // Return 'true' to prevent the UI from prompting the user for access to the
+  // address book again.
+  if (!personal_data_)
+    return true;
+  return personal_data_->HasPromptedForAccessToAddressBook();
+}
+
+bool AutofillManager::FieldSupportsAddressBookAutofill(
+    const FormData& data,
+    const FormFieldData& fieldData) {

[Ilya Sherman, 2014/05/21 11:29:15]

nit: "fieldData" -> "field" or "field_data"

[erikchen, 2014/05/21 22:00:54]

ack, thanks. I've been writing too much ObjC.

+  for (auto it : form_structures_) {

[Ilya Sherman, 2014/05/21 11:29:15]

C++ files should not use auto.  It's fine to keep the "auto" if you move this
into the .mm file, though.

[erikchen, 2014/05/21 22:00:54]

I've moved this logic into personal_data_manager_mac.mm, but also removed the
'auto' keyword. I seem to recall a conversation with thakis where he mentioned
that Chromium still supports non C++11 compliant compilers?

[Ilya Sherman, 2014/05/22 15:13:59]

Chromium in general still supports non C++11 compliant compilers, but Chromium
on Mac only supports clang, which is C++11 compliant.  Hence, you can use auto
in Mac-only files.

+    // The form does not match.
+    if (it->ToFormData().name != data.name)
+      continue;
+    for (size_t index = 0; index < it->field_count(); ++index) {
+      const AutofillField* field = it->field(index);
+      // The field does not match.
+      if (field->name != fieldData.name)
+        continue;
+
+      switch (field->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;
+}
+
+void AutofillManager::AccessAddressBook() {
+  if (!personal_data_)
+    return;
+  personal_data_->AccessAddressBook();
+}
+#endif  // defined(OS_MACOSX)

[Ilya Sherman, 2014/05/21 11:29:15]

I'd prefer to not make any changes to the AutofillManager class, and instead to
get at the personal_data_manager via
autofill_manager_->delegate()->GetPersonalDataManager().

[erikchen, 2014/05/21 22:00:54]

The method ShouldShowAccessAddressBookSuggestion needed to be piped through
autofill_manager to get access to the form_structures_ vector. For symmetry, I
piped AccessAddressBook through the AutofillManager, even though that is not
strictly necessary.

+
 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 885 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