mac: Prevent Address Book permissions dialog from erroneously appearing.

chrome/browser/ui/autofill/chrome_autofill_client.h

Index: chrome/browser/ui/autofill/chrome_autofill_client.h
diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.h b/chrome/browser/ui/autofill/chrome_autofill_client.h
index 57a19de4aef4d6b53afd3b5bb42735c555df6272..2236ee5046953be46023445590fb3280446451cc 100644
--- a/chrome/browser/ui/autofill/chrome_autofill_client.h
+++ b/chrome/browser/ui/autofill/chrome_autofill_client.h
@@ -22,6 +22,7 @@ class WebContents;
 namespace autofill {
 
 class AutofillDialogController;
+class AutofillKeystoneBridgeWrapper;
 class AutofillPopupControllerImpl;
 struct FormData;
 
@@ -81,6 +82,15 @@ class ChromeAutofillClient
   }
 
  private:
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+  // Creates bridge_wrapper_, which is responsible for dealing with Keystone

[Ilya Sherman, 2014/06/17 19:55:01]

nit: "bridge_wrapper_" -> "|bridge_wrapper_|"

[erikchen, 2014/06/17 22:36:06]

Done.

+  // notifications.
+  void RegisterForKeystoneNotifications();
+
+  // Deletes bridge_wrapper_.
+  void UnregisterFromKeystoneNotifications();
+#endif  // defined(OS_MACOSX) && !defined(OS_IOS)
+
   explicit ChromeAutofillClient(content::WebContents* web_contents);
   friend class content::WebContentsUserData<ChromeAutofillClient>;
 
@@ -88,6 +98,17 @@ class ChromeAutofillClient
   base::WeakPtr<AutofillDialogController> dialog_controller_;
   base::WeakPtr<AutofillPopupControllerImpl> popup_controller_;
 
+#if defined(OS_MACOSX) && !defined(OS_IOS)
+  // Listens to Keystone notifications and passes relevant ones on to the
+  // PersonalDataManager.
+  //
+  // The class of this member must remain a forward declaration, even in the
+  // .cc implementation file, since the header file for the class requires
+  // ObjC++ to compile. This means that the pointer cannot be wrapped in a
+  // scoped_ptr.

[Ilya Sherman, 2014/06/17 19:55:01]

This explanation isn't quite right anymore.  The issue is that the class is
defined in a Mac-only file, and hence the definition isn't visible from the
ChromeAutofillClient destructor.  Which is similar to what you've written, but
there's no header file that requires ObjC++ to compile.

[erikchen, 2014/06/17 22:36:06]

You're right. I've fixed the explanation.

+  AutofillKeystoneBridgeWrapper* bridge_wrapper_;
+#endif  // defined(OS_MACOSX) && !defined(OS_IOS)
+
   DISALLOW_COPY_AND_ASSIGN(ChromeAutofillClient);
 };