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

chrome/browser/cocoa/extensions/browser_actions_controller.mm

Index: chrome/browser/cocoa/extensions/browser_actions_controller.mm
===================================================================
--- chrome/browser/cocoa/extensions/browser_actions_controller.mm	(revision 35091)
+++ chrome/browser/cocoa/extensions/browser_actions_controller.mm	(working copy)
@@ -281,11 +281,14 @@
         [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";
     }
@@ -316,6 +319,7 @@
     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;