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

chrome/browser/cocoa/location_bar_view_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/cocoa/location_bar_view_mac.h"
 
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
@@ skipping 468 matching lines @@
 
 // PageActionImageView----------------------------------------------------------
 
 LocationBarViewMac::PageActionImageView::PageActionImageView(
     LocationBarViewMac* owner,
     Profile* profile,
     ExtensionAction* page_action)
     : owner_(owner),
       profile_(profile),
       page_action_(page_action),
+      popup_controller_(nil),
       current_tab_id_(-1),
       preview_enabled_(false) {
   Extension* extension = profile->GetExtensionsService()->GetExtensionById(
       page_action->extension_id(), false);
   DCHECK(extension);
 
   // Load all the icons declared in the manifest. This is the contents of the
   // icons array, plus the default_icon property, if any.
   std::vector<std::string> icon_paths(*page_action->icon_paths());
   if (!page_action_->default_icon_path().empty())
@@ skipping 24 matching lines @@
     NSWindow* window = [textField window];
     NSRect relativeBounds = [[window contentView] convertRect:bounds
                                                      fromView:textField];
     NSPoint arrowPoint = [window convertBaseToScreen:NSMakePoint(
         NSMinX(relativeBounds),
         NSMinY(relativeBounds))];
 
     // Adjust the anchor point to be at the center of the page action icon.
     arrowPoint.x += [GetImage() size].width / 2;
 
-    popupController_ =
+    popup_controller_ =
         [ExtensionPopupController showURL:page_action_->popup_url()
                                 inBrowser:BrowserList::GetLastActive()
                                anchoredAt:arrowPoint
                             arrowLocation:kTopRight];
     } else {
       ExtensionBrowserEventRouter::GetInstance()->PageActionExecuted(
           profile_, page_action_->extension_id(), page_action_->id(),
           current_tab_id_, current_url_.spec(),
           1);  // TODO(pamg): Add support for middle and right buttons.
   }
@@ skipping 72 matching lines @@
   SetVisible(visible);
 }
 
 void LocationBarViewMac::PageActionImageView::Observe(
     NotificationType type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   switch (type.value) {
     case NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE:
       // If we aren't the host of the popup, then disregard the notification.
-      if (popupController_ &&
-          Details<ExtensionHost>([popupController_ host]) == details) {
-        HidePopup();
+      if (popup_controller_ == nil ||

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

Same comment about early returns applies here.

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

Done.

+          Details<ExtensionHost>([popup_controller_ host]) != details) {
+        return;
       }
+      HidePopup();
       break;
     default:
       NOTREACHED() << "Unexpected notification";
       break;
   }
 }
 
 void LocationBarViewMac::PageActionImageView::HidePopup() {
-  [popupController_ close];
-  popupController_ = nil;
+  [popup_controller_ close];
+  popup_controller_ = nil;
 }
 
 // PageActionViewList-----------------------------------------------------------
 
 void LocationBarViewMac::PageActionViewList::DeleteAll() {
   if (!views_.empty()) {
     STLDeleteContainerPointers(views_.begin(), views_.end());
     views_.clear();
   }
 }
@@ skipping 72 matching lines @@
     if (views_[i]->IsVisible())
       ++result;
   }
   return result;
 }
 
 void LocationBarViewMac::PageActionViewList::OnMousePressed(NSRect iconFrame,
                                                             size_t index) {
   ViewAt(index)->OnMousePressed(iconFrame);
 }