[Mac] Fixes a bug where an ExtensionPopupController object's pointer was neve...

chrome/browser/cocoa/extensions/browser_actions_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.
 
 #import "browser_actions_controller.h"
 
 #include <string>
 
 #include "app/gfx/canvas_paint.h"
 #include "base/sys_string_conversions.h"
@@ skipping 263 matching lines @@
         [owner_ browserActionVisibilityHasChanged];
         break;
       }
       case NotificationType::EXTENSION_UNLOADED:
       case NotificationType::EXTENSION_UNLOADED_DISABLED: {
         Extension* extension = Details<Extension>(details).ptr();
         [owner_ removeActionButtonForExtension:extension];
         [owner_ browserActionVisibilityHasChanged];
         break;
       }
-      case NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE:
-        if (Details<ExtensionHost>([[owner_ popup] host]) != details)
+      case NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE: {
+        ExtensionPopupController* popup = [owner_ popup];
+        if (popup == nil || Details<ExtensionHost>([popup host]) != details)

[Mark Mentovai, 2009/12/21 20:54:32]

Things are sometimes a tiny bit easier to follow if early returns aren't
sprinkled throughout functions.   Maybe you should ! this condition and put
[owner_ hidePopup] inside the controlled block, and get rid of the early return.

[Bons, 2009/12/21 21:01:41]

Done.

           return;
+
         [owner_ hidePopup];
         break;
+      }
       default:
         NOTREACHED() << L"Unexpected notification";
     }
   }
 
  private:
   // The object we need to inform when we get a notification. Weak. Owns us.
   BrowserActionsController* owner_;
 
   // Used for registering to receive notifications and automatic clean up.
@@ skipping 10 matching lines @@
 
   if ((self = [super init])) {
     browser_ = browser;
     profile_ = browser->profile();
 
     containerView_ = container;
     [containerView_ setHidden:YES];
     observer_.reset(new ExtensionsServiceObserverBridge(self, profile_));
     buttons_.reset([[NSMutableDictionary alloc] init]);
     buttonOrder_.reset([[NSMutableArray alloc] init]);
+    popupController_ = nil;

[Mark Mentovai, 2009/12/21 20:54:32]

Not strictly necessary, because -alloc zero-fills the entire object.  I guess
you can leave this in if you like being explicit, but it's customary not to set
things to nil in -init methods.

[Bons, 2009/12/21 21:01:41]

Done.

   }
 
   return self;
 }
 
 - (void)update {
   for (BrowserActionButton* button in [buttons_ allValues]) {
     [button updateState];
   }
 }
@@ skipping 128 matching lines @@
     return -1;
 
   return selected_tab->controller().session_id().id();
 }
 
 - (NSButton*)buttonWithIndex:(int)index {
   return [buttonOrder_ objectAtIndex:(NSUInteger)index];
 }
 
 @end