mac: Prevent Address Book permissions dialog from erroneously appearing.

chrome/browser/mac/keystone_glue.h

Index: chrome/browser/mac/keystone_glue.h
diff --git a/chrome/browser/mac/keystone_glue.h b/chrome/browser/mac/keystone_glue.h
index 5c21c369e80294ede452810b37885491d48c7f79..85526f585b9170d274b5d1ce61b11cea3516eba0 100644
--- a/chrome/browser/mac/keystone_glue.h
+++ b/chrome/browser/mac/keystone_glue.h
@@ -8,12 +8,13 @@
 #include "base/strings/string16.h"
 
 #if defined(__OBJC__)
-
 #import <Foundation/Foundation.h>
 
 #include "base/mac/scoped_authorizationref.h"
 #import "base/mac/scoped_nsobject.h"
+#endif  // __OBJC__

[Ilya Sherman, 2014/06/14 01:18:51]

Why is this header ever included on non-Mac platforms?

[erikchen, 2014/06/16 20:30:46]

I don't know?

 
+namespace keystone_glue {

[Ilya Sherman, 2014/06/14 01:18:51]

Why is this namespace needed?

[Ilya Sherman, 2014/06/14 01:18:51]

nit: Please leave a blank line after this one...

[erikchen, 2014/06/16 20:30:46]

Done (adding vertical whitespace). I could not find a style guideline that
explicitly states this, and the Chrome codebase is certainly not consistent
about this.

[erikchen, 2014/06/16 20:30:46]

I was under the impression that there is a style guideline that enums should
never be released into the global namespace. Looking through Google/Chromium
style guides, I could not find this statement, but I still think its good
practice.

 // Possible outcomes of various operations.  A version may accompany some of
 // these, but beware: a version is never required.  For statuses that can be
 // accompanied by a version, the comment indicates what version is referenced.
@@ -36,14 +37,18 @@ enum AutoupdateStatus {
   kAutoupdatePromoteFailed,   // no version
   kAutoupdateNeedsPromotion,  // no version
 };
+}  // namespace keystone_glue

[Ilya Sherman, 2014/06/14 01:18:51]

nit: ... and before this one.

[erikchen, 2014/06/16 20:30:46]

Done.

+
+#if defined(__OBJC__)
 
 // kAutoupdateStatusNotification is the name of the notification posted when
-// -checkForUpdate and -installUpdate complete.  This notification will be
-// sent with with its sender object set to the KeystoneGlue instance sending
-// the notification.  Its userInfo dictionary will contain an AutoupdateStatus
+// -checkForUpdate and -installUpdate complete.  This notification will be sent
+// with with its sender object set to the KeystoneGlue instance sending the
+// notification.  Its userInfo dictionary will contain an AutoupdateStatus
 // value as an intValue at key kAutoupdateStatusStatus.  If a version is
 // available (see AutoupdateStatus), it will be present at key
-// kAutoupdateStatusVersion.
+// kAutoupdateStatusVersion. This notification is always posted on the main
+// thread.
 extern NSString* const kAutoupdateStatusNotification;
 extern NSString* const kAutoupdateStatusStatus;
 extern NSString* const kAutoupdateStatusVersion;
@@ -122,7 +127,7 @@ enum BrandFileType {
 
 // Accessor for the kAutoupdateStatusStatus field of recentNotification_'s
 // userInfo dictionary.
-- (AutoupdateStatus)recentStatus;
+- (keystone_glue::AutoupdateStatus)recentStatus;
 
 // Returns YES if an asynchronous operation is pending: if an update check or
 // installation attempt is currently in progress.