Merge 32277 - Fix a crash when activating a select element inside a page...

chrome/browser/views/location_bar_view.cc

 // 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 "chrome/browser/views/location_bar_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 1276 matching lines @@
 LocationBarView::PageActionImageView::PageActionImageView(
     LocationBarView* owner,
     Profile* profile,
     ExtensionAction* page_action,
     const BubblePositioner* bubble_positioner)
     : LocationBarImageView(bubble_positioner),
       owner_(owner),
       profile_(profile),
       page_action_(page_action),
       current_tab_id_(-1),
-      preview_enabled_(false) {
+      preview_enabled_(false),
+      popup_(NULL),
+      ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
   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())
     icon_paths.push_back(page_action_->default_icon_path());
 
   tracker_ = new ImageLoadingTracker(this, icon_paths.size());
   for (std::vector<std::string>::iterator iter = icon_paths.begin();
        iter != icon_paths.end(); ++iter) {
     tracker_->PostLoadImageTask(
         extension->GetResource(*iter),
         gfx::Size(Extension::kPageActionIconMaxSize,
                   Extension::kPageActionIconMaxSize));
   }
 }
 
 LocationBarView::PageActionImageView::~PageActionImageView() {
   if (tracker_)
     tracker_->StopTrackingImageLoad();
+
+  if (popup_)
+    HidePopup();
 }
 
 void LocationBarView::PageActionImageView::ExecuteAction(int button) {
   if (page_action_->has_popup()) {
-    gfx::Point origin;
-    View::ConvertPointToScreen(this, &origin);
-    gfx::Rect rect = bounds();
-    rect.set_x(origin.x());
-    rect.set_y(origin.y());
-
     // In tests, GetLastActive could return NULL, so we need to have
     // a fallback.
     // TODO(erikkay): Find a better way to get the Browser that this
     // button is in.
     Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
     if (!browser)
       browser = BrowserList::FindBrowserWithProfile(profile_);
-    ExtensionPopup::Show(page_action_->popup_url(), browser, rect,
-                         BubbleBorder::TOP_RIGHT);
+
+    // Always hide the current popup. Only one popup at a time.
+    HidePopup();
+
+    gfx::Point origin;
+    View::ConvertPointToScreen(this, &origin);
+    gfx::Rect rect = bounds();
+    rect.set_x(origin.x());
+    rect.set_y(origin.y());
+    popup_ = ExtensionPopup::Show(page_action_->popup_url(), browser, rect,
+                                  BubbleBorder::TOP_RIGHT);
+    popup_->set_delegate(this);
   } else {
     ExtensionBrowserEventRouter::GetInstance()->PageActionExecuted(
         profile_, page_action_->extension_id(), page_action_->id(),
         current_tab_id_, current_url_.spec(), button);
   }
 }
 
 void LocationBarView::PageActionImageView::OnMouseMoved(
     const views::MouseEvent& event) {
   // PageActionImageView uses normal tooltips rather than the info bubble,
@@ skipping 83 matching lines @@
           icon = iter->second;
       }
     }
 
     if (!icon.isNull())
       ImageView::SetImage(&icon);
   }
   SetVisible(visible);
 }
 
+void LocationBarView::PageActionImageView::BubbleBrowserWindowClosing(
+    BrowserBubble* bubble) {
+  HidePopup();
+}
+
+void LocationBarView::PageActionImageView::BubbleLostFocus(
+    BrowserBubble* bubble) {
+  if (!popup_)
+    return;
+
+  MessageLoop::current()->PostTask(FROM_HERE,
+      method_factory_.NewRunnableMethod(
+          &LocationBarView::PageActionImageView::HidePopup));
+}
+
+void LocationBarView::PageActionImageView::HidePopup() {
+  if (!popup_)
+    return;
+
+  // This sometimes gets called via a timer (See BubbleLostFocus), so clear
+  // the method factory. in case one is pending.
+  method_factory_.RevokeAll();
+
+  // Save the popup in a local since destroying it calls BubbleLostFocus,
+  // which will try to call HidePopup() again.
+  ExtensionPopup* closing_popup = popup_;
+  popup_ = NULL;
+
+  closing_popup->DetachFromBrowser();
+  delete closing_popup;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, LocationBar implementation:
 
 void LocationBarView::ShowFirstRunBubble(bool use_OEM_bubble) {
   // We wait 30 milliseconds to open. It allows less flicker.
   Task* task = first_run_bubble_.NewRunnableMethod(
       &LocationBarView::ShowFirstRunBubbleInternal, use_OEM_bubble);
   MessageLoop::current()->PostDelayedTask(FROM_HERE, task, 30);
 }
 
@@ skipping 78 matching lines @@
           const int button = 1;  // Left mouse button.
           page_action_views_[i]->image_view()->ExecuteAction(button);
           return;
         }
         ++current;
       }
     }
   }
   NOTREACHED();
 }