mac: Prevent Address Book permissions dialog from erroneously appearing.

chrome/browser/mac/keystone_glue.h

 // Copyright (c) 2012 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_MAC_KEYSTONE_GLUE_H_
 #define CHROME_BROWSER_MAC_KEYSTONE_GLUE_H_
 
 #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__
+
+namespace keystone_glue {
 
 // 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.
 // A notification posted containing an asynchronous status will always be
 // followed by a notification with a terminal status.
 enum AutoupdateStatus {
   kAutoupdateNone = 0,        // no version (initial state only)
   kAutoupdateRegistering,     // no version (asynchronous operation in progress)
   kAutoupdateRegistered,      // no version
   kAutoupdateChecking,        // no version (asynchronous operation in progress)
   kAutoupdateCurrent,         // version of the running application
   kAutoupdateAvailable,       // version of the update that is available
   kAutoupdateInstalling,      // no version (asynchronous operation in progress)
   kAutoupdateInstalled,       // version of the update that was installed
   kAutoupdatePromoting,       // no version (asynchronous operation in progress)
   kAutoupdatePromoted,        // no version
   kAutoupdateRegisterFailed,  // no version
   kAutoupdateCheckFailed,     // no version
   kAutoupdateInstallFailed,   // no version
   kAutoupdatePromoteFailed,   // no version
   kAutoupdateNeedsPromotion,  // no version
 };
 
+}  // namespace keystone_glue

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

I would prefer not to add this namespace as part of this CL.  If you're really
keen on adding this, please split that change off to a separate CL, and ask an
owner of //chrome/browser/mac to review it.  In general, though, it's uncommon
to use namespaces around enums in //chrome.  Instead, enums are typically named
in a wacky verbose style.  For this enum, the Chrome convention would be
something like this:

enum KeystoneAutoupdateStatus {
  KEYSTONE_AUTOUPDATE_STATUS_NONE = 0,
  KEYSTONE_AUTOUPDATE_STATUS_REGISTERED,
  // etc.
}

Specifically, the style is to pick a verbose name for the enum, so that the enum
name is clear and does not conflict with anything, and then to have each
enumerated constant's name contain the entire enum name as a prefix.  I assume
that this is preferred over namespaces because most other code isn't namespaced,
and its a little awkward to use namespaces just for enums -- especially given
that Objective-C doesn't support namespaces.

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

I have reverted the namespace change, and well as the DCHECK in
keystone_glue.mm, and the additional comment. I was trying to do the "right"
thing, but I'm happy to write less code and have fewer reviewers.

+
+#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;
 
 namespace {
 
 enum BrandFileType {
   kBrandFileTypeNotDetermined = 0,
   kBrandFileTypeNone,
   kBrandFileTypeUser,
@@ skipping 58 matching lines @@
 // a kAutoupdateStatusNotification notification, and will also be available
 // through -recentNotification.
 - (void)checkForUpdate;
 - (void)installUpdate;
 
 // Accessor for recentNotification_.  Returns an autoreleased NSNotification.
 - (NSNotification*)recentNotification;
 
 // 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.
 - (BOOL)asyncOperationPending;
 
 // Returns YES if the application is running from a read-only filesystem,
 // such as a disk image.
 - (BOOL)isOnReadOnlyFilesystem;
 
 // -needsPromotion is YES if the application needs its ticket promoted to
@@ skipping 69 matching lines @@
 
 // True if Keystone is enabled.
 bool KeystoneEnabled();
 
 // The version of the application currently installed on disk.
 base::string16 CurrentlyInstalledVersion();
 
 }  // namespace keystone_glue
 
 #endif  // CHROME_BROWSER_MAC_KEYSTONE_GLUE_H_