About box auto-update improvements

chrome/browser/app_controller_mac.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.
 
 #import "chrome/browser/app_controller_mac.h"
 
 #include "app/l10n_util_mac.h"
 #include "base/command_line.h"
 #include "base/mac_util.h"
 #include "base/message_loop.h"
@@ skipping 647 matching lines @@
                name:kUserDoneEditingPrefsNotification
              object:prefsController_.get()];
   }
   [prefsController_ showPreferences:sender];
 }
 
 // Called when the about window is closed. We use this to release the
 // window controller.
 - (void)aboutWindowClosed:(NSNotification*)notify {
   [[NSNotificationCenter defaultCenter]
-    removeObserver:self
-              name:kUserClosedAboutNotification
-            object:aboutController_.get()];
-  aboutController_.reset(NULL);
+      removeObserver:self
+                name:kUserClosedAboutNotification
+              object:aboutController_.get()];
+  aboutController_.reset(nil);
 }
 
 - (IBAction)orderFrontStandardAboutPanel:(id)sender {
-  // Otherwise bring up our special dialog (e.g. with an auto-update button).
   if (!aboutController_) {
     aboutController_.reset([[AboutWindowController alloc]
-                             initWithProfile:[self defaultProfile]]);
-    if (!aboutController_) {
-      // If we get here something is wacky.  I managed to do it when
-      // testing by explicitly forcing an auto-update to an older
-      // version then trying to open the about box again (missing
-      // nib).  This shouldn't be possible in general but let's try
-      // hard to not do nothing.
-      [NSApp orderFrontStandardAboutPanel:sender];
-      return;
-    }
+                            initWithProfile:[self defaultProfile]]);
+
     // Watch for a notification of when it goes away so that we can destroy
     // the controller.
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(aboutWindowClosed:)
                name:kUserClosedAboutNotification
              object:aboutController_.get()];
   }
+
   if (![[aboutController_ window] isVisible])
     [[aboutController_ window] center];
+
   [aboutController_ showWindow:self];
 }
 
 // Explicitly bring to the foreground when creating new windows from the dock.
 - (void)newWindowFromDock:(id)sender {
   [NSApp activateIgnoringOtherApps:YES];
   [self commandDispatch:sender];
 }
 
 - (NSMenu*)applicationDockMenu:(id)sender {
@@ skipping 21 matching lines @@
 @end
 
 //---------------------------------------------------------------------------
 
 // Stub for cross-platform method that isn't called on Mac OS X.
 void ShowOptionsWindow(OptionsPage page,
                        OptionsGroup highlight_group,
                        Profile* profile) {
   NOTIMPLEMENTED();
 }