Make KeystoneGlue less antisocial

chrome/browser/cocoa/about_window_controller.mm

 // Copyright (c) 2009 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 "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/mac_util.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
@@ skipping 78 matching lines @@
                  object:nil];
   }
   return self;
 }
 
 - (void)dealloc {
   [[NSNotificationCenter defaultCenter] removeObserver:self];
   [super dealloc];
 }
 
+// YES when an About box is currently showing the kAutoupdateInstallFailed
+// status, or if no About box is visible, if the most recent About box to be
+// closed was closed while showing this status.  When an About box opens, if
+// the recent status is kAutoupdateInstallFailed and
+// recentShownInstallFailedStatus is NO, the failure needs to be shown instead
+// of launching a new update check.  recentShownInstallFailedStatus is
+// maintained by -updateStatus:.
+static BOOL recentShownInstallFailedStatus = NO;
+
 - (void)awakeFromNib {
   NSBundle* bundle = mac_util::MainAppBundle();
   NSString* chromeVersion =
       [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
 
 #if defined(GOOGLE_CHROME_BUILD)
   NSString* version = chromeVersion;
 #else  // GOOGLE_CHROME_BUILD
   // The format string is not localized, but this is how the displayed version
   // is built on Windows too.
@@ skipping 26 matching lines @@
   [legalText_ sizeToFit];
   NSRect newRect = oldLegalRect;
   newRect.size.height = [legalText_ frame].size.height;
   [legalBlock_ setFrame:newRect];
   CGFloat legalShift = newRect.size.height - oldLegalRect.size.height;
 
   KeystoneGlue* keystoneGlue = [KeystoneGlue defaultKeystoneGlue];
   CGFloat updateShift;
   if (keystoneGlue) {
     if ([keystoneGlue asyncOperationPending] ||
-        [keystoneGlue recentStatus] == kAutoupdateInstallFailed) {
+        ([keystoneGlue recentStatus] == kAutoupdateInstallFailed &&
+         !recentShownInstallFailedStatus)) {
       // 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 a previous update attempt was unsuccessful but no About box was
       // around to report the error, show it now, and allow another chance to
       // install the update.
       [self updateStatus:[keystoneGlue recentNotification]];
     } else {
       // Launch a new update check, even if one was already completed, because
@@ skipping 72 matching lines @@
 
   // Immediately, kAutoupdateStatusNotification will be posted, and
   // -updateStatus: will be called with status kAutoupdateInstalling.
   //
   // Upon completion, kAutoupdateStatusNotification will be posted, and
   // -updateStatus: will be called with a status indicating the result of the
   // installation attempt.
 }
 
 - (void)updateStatus:(NSNotification*)notification {
+  recentShownInstallFailedStatus = NO;
+
   NSDictionary* dictionary = [notification userInfo];
   AutoupdateStatus status = static_cast<AutoupdateStatus>(
       [[dictionary objectForKey:kAutoupdateStatusStatus] intValue]);
 
   // Don't assume |version| is a real string.  It may be nil.
   NSString* version = [dictionary objectForKey:kAutoupdateStatusVersion];
 
   bool throbber = false;
   int imageID = 0;
   NSString* message;
@@ skipping 16 matching lines @@
 
     case kAutoupdateAvailable:
       imageID = IDR_UPDATE_AVAILABLE;
       message = l10n_util::GetNSStringFWithFixup(
           IDS_UPGRADE_AVAILABLE, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
       [updateNowButton_ setEnabled:YES];
 
       break;
 
     case kAutoupdateInstalling:
-      // Don't let someone click "Update Now" twice.
+      // Don't let anyone click "Update Now" twice.
       [updateNowButton_ setEnabled:NO];
 
       throbber = true;
       message = l10n_util::GetNSStringWithFixup(IDS_UPGRADE_STARTED);
 
       break;
 
     case kAutoupdateInstalled:
       {
         imageID = IDR_UPDATE_UPTODATE;
@@ skipping 11 matching lines @@
         // TODO(mark): Turn the button in the dialog into a restart button
         // instead of springing this sheet or dialog.
         NSWindow* window = [self window];
         NSWindow* restartDialogParent = [window isVisible] ? window : nil;
         restart_browser::RequestRestart(restartDialogParent);
       }
 
       break;
 
     case kAutoupdateInstallFailed:
-      // Since the installation failure will now be displayed in an About box,
-      // the saved state can be cleared.  If the About box is closed and then
-      // reopened, this will let it start out with a clean slate and not be
-      // affected by past failures.
-      [[KeystoneGlue defaultKeystoneGlue] clearRecentNotification];
+      recentShownInstallFailedStatus = YES;
 
       // Allow another chance.
       [updateNowButton_ setEnabled:YES];
 
       // Fall through.
 
     case kAutoupdateCheckFailed:
       // TODO(mark): Keystone doesn't currently indicate when a check for
       // updates failed.  Fix that.
       imageID = IDR_UPDATE_FAIL;
@@ skipping 153 matching lines @@
   NSRange string_range = NSMakeRange(0, [legal_block length]);
   [legal_block addAttribute:NSFontAttributeName
                       value:[NSFont labelFontOfSize:11]
                       range:string_range];
 
   [legal_block endEditing];
   return legal_block;
 }
 
 @end  // @implementation AboutWindowController