mac: Prevent Address Book permissions dialog from erroneously appearing.

chrome/browser/ui/webui/help/version_updater_mac.mm

 // 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.
 
 #include "chrome/browser/ui/webui/help/version_updater_mac.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #import "chrome/browser/mac/keystone_glue.h"
@@ skipping 58 matching lines @@
 void VersionUpdaterMac::CheckForUpdate(
     const StatusCallback& status_callback,
     const PromoteCallback& promote_callback) {
   // Copy the callbacks, we will re-use this for the remaining lifetime
   // of this object.
   status_callback_ = status_callback;
   promote_callback_ = promote_callback;
 
   KeystoneGlue* keystone_glue = [KeystoneGlue defaultKeystoneGlue];
   if (keystone_glue && ![keystone_glue isOnReadOnlyFilesystem]) {
-    AutoupdateStatus recent_status = [keystone_glue recentStatus];
+    keystone_glue::AutoupdateStatus recent_status =
+        [keystone_glue recentStatus];
     if ([keystone_glue asyncOperationPending] ||
-        recent_status == kAutoupdateRegisterFailed ||
-        recent_status == kAutoupdateNeedsPromotion) {
+        recent_status == keystone_glue::kAutoupdateRegisterFailed ||
+        recent_status == keystone_glue::kAutoupdateNeedsPromotion) {
       // If an asynchronous update operation is currently pending, such as a
       // check for updates or an update installation attempt, set the status
       // up correspondingly without launching a new update check.
       //
       // If registration failed, no other operations make sense, so just go
       // straight to the error.
       UpdateStatus([[keystone_glue recentNotification] userInfo]);
     } else {
       // Launch a new update check, even if one was already completed, because
       // a new update may be available or a new update may have been installed
@@ skipping 30 matching lines @@
   // and UpdateStatus() will be called again indicating first that
   // registration is in progress and subsequently that it has completed.
 }
 
 void VersionUpdaterMac::RelaunchBrowser() const {
   // Tell the Broweser to restart if possible.
   chrome::AttemptRestart();
 }
 
 void VersionUpdaterMac::UpdateStatus(NSDictionary* dictionary) {
-  AutoupdateStatus keystone_status = static_cast<AutoupdateStatus>(
-      [[dictionary objectForKey:kAutoupdateStatusStatus] intValue]);
+  keystone_glue::AutoupdateStatus keystone_status =
+      static_cast<keystone_glue::AutoupdateStatus>(
+          [[dictionary objectForKey:kAutoupdateStatusStatus] intValue]);
 
   bool enable_promote_button = true;
   base::string16 message;
 
   Status status;
   switch (keystone_status) {
-    case kAutoupdateRegistering:
-    case kAutoupdateChecking:
+    case keystone_glue::kAutoupdateRegistering:
+    case keystone_glue::kAutoupdateChecking:
       status = CHECKING;
       enable_promote_button = false;
       break;
 
-    case kAutoupdateRegistered:
-    case kAutoupdatePromoted:
+    case keystone_glue::kAutoupdateRegistered:
+    case keystone_glue::kAutoupdatePromoted:
       UpdateShowPromoteButton();
       // Go straight into an update check. Return immediately, this routine
       // will be re-entered shortly with kAutoupdateChecking.
       [[KeystoneGlue defaultKeystoneGlue] checkForUpdate];
       return;
 
-    case kAutoupdateCurrent:
+    case keystone_glue::kAutoupdateCurrent:
       status = UPDATED;
       break;
 
-    case kAutoupdateAvailable:
+    case keystone_glue::kAutoupdateAvailable:
       // Install the update automatically. Return immediately, this routine
       // will be re-entered shortly with kAutoupdateInstalling.
       [[KeystoneGlue defaultKeystoneGlue] installUpdate];
       return;
 
-    case kAutoupdateInstalling:
+    case keystone_glue::kAutoupdateInstalling:
       status = UPDATING;
       enable_promote_button = false;
       break;
 
-    case kAutoupdateInstalled:
+    case keystone_glue::kAutoupdateInstalled:
       status = NEARLY_UPDATED;
       break;
 
-    case kAutoupdatePromoting:
+    case keystone_glue::kAutoupdatePromoting:
 #if 1
       // TODO(mark): KSRegistration currently handles the promotion
       // synchronously, meaning that the main thread's loop doesn't spin,
       // meaning that animations and other updates to the window won't occur
       // until KSRegistration is done with promotion. This looks laggy and bad
       // and probably qualifies as "jank." For now, there just won't be any
       // visual feedback while promotion is in progress, but it should complete
       // (or fail) very quickly.  http://b/2290009.
       return;
 #endif
       status = CHECKING;
       enable_promote_button = false;
       break;
 
-    case kAutoupdateRegisterFailed:
+    case keystone_glue::kAutoupdateRegisterFailed:
       enable_promote_button = false;
       // Fall through.
-    case kAutoupdateCheckFailed:
-    case kAutoupdateInstallFailed:
-    case kAutoupdatePromoteFailed:
+    case keystone_glue::kAutoupdateCheckFailed:
+    case keystone_glue::kAutoupdateInstallFailed:
+    case keystone_glue::kAutoupdatePromoteFailed:
       status = FAILED;
       message = l10n_util::GetStringFUTF16Int(IDS_UPGRADE_ERROR,
                                               keystone_status);
       break;
 
-    case kAutoupdateNeedsPromotion:
-      {
+    case keystone_glue::kAutoupdateNeedsPromotion: {
         status = FAILED;
         base::string16 product_name =
             l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
         message = l10n_util::GetStringFUTF16(IDS_PROMOTE_INFOBAR_TEXT,
                                              product_name);
       }
       break;
 
     default:
       NOTREACHED();
@@ skipping 13 matching lines @@
 
 void VersionUpdaterMac::UpdateShowPromoteButton() {
   if (ObsoleteSystemMac::Has32BitOnlyCPU() &&
       ObsoleteSystemMac::Is32BitEndOfTheLine()) {
     // Promotion is moot upon reaching the end of the line.
     show_promote_button_ = false;
     return;
   }
 
   KeystoneGlue* keystone_glue = [KeystoneGlue defaultKeystoneGlue];
-  AutoupdateStatus recent_status = [keystone_glue recentStatus];
-  if (recent_status == kAutoupdateRegistering ||
-      recent_status == kAutoupdateRegisterFailed ||
-      recent_status == kAutoupdatePromoted) {
+  keystone_glue::AutoupdateStatus recent_status = [keystone_glue recentStatus];
+  if (recent_status == keystone_glue::kAutoupdateRegistering ||
+      recent_status == keystone_glue::kAutoupdateRegisterFailed ||
+      recent_status == keystone_glue::kAutoupdatePromoted) {
     // Promotion isn't possible at this point.
     show_promote_button_ = false;
-  } else if (recent_status == kAutoupdatePromoting ||
-             recent_status == kAutoupdatePromoteFailed) {
+  } else if (recent_status == keystone_glue::kAutoupdatePromoting ||
+             recent_status == keystone_glue::kAutoupdatePromoteFailed) {
     // Show promotion UI because the user either just clicked that button or
     // because the user should be able to click it again.
     show_promote_button_ = true;
   } else {
     // Show the promote button if promotion is a possibility.
     show_promote_button_ = [keystone_glue wantsPromotion];
   }
 }