mac: Prevent Address Book permissions dialog from erroneously appearing.

chrome/browser/ui/autofill/chrome_autofill_client.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_CHROME_AUTOFILL_CLIENT_H_
 #define CHROME_BROWSER_UI_AUTOFILL_CHROME_AUTOFILL_CLIENT_H_
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/weak_ptr.h"
 #include "components/autofill/core/browser/autofill_client.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
 namespace content {
 struct FrameNavigateParams;
 struct LoadCommittedDetails;
 class WebContents;
 }
 
 namespace autofill {
 
 class AutofillDialogController;
+class AutofillKeystoneBridgeWrapper;
 class AutofillPopupControllerImpl;
 struct FormData;
 
 // Chrome implementation of AutofillClient.
 class ChromeAutofillClient
     : public AutofillClient,
       public content::WebContentsUserData<ChromeAutofillClient>,
       public content::WebContentsObserver {
  public:
   virtual ~ChromeAutofillClient();
@@ skipping 39 matching lines @@
   // Exposed for testing.
   AutofillDialogController* GetDialogControllerForTesting() {
     return dialog_controller_.get();
   }
   void SetDialogControllerForTesting(
       const base::WeakPtr<AutofillDialogController>& dialog_controller) {
     dialog_controller_ = dialog_controller;
   }
 
  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>;
 
   content::WebContents* const web_contents_;
   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);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_CHROME_AUTOFILL_CLIENT_H_