Initial support for inspecting extension popups.

chrome/browser/views/location_bar_view.cc

 // Copyright (c) 2010 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 1409 matching lines @@
     Profile* profile,
     ExtensionAction* page_action,
     const BubblePositioner* bubble_positioner)
     : LocationBarImageView(bubble_positioner),
       owner_(owner),
       profile_(profile),
       page_action_(page_action),
       tracker_(NULL),
       current_tab_id_(-1),
       preview_enabled_(false),
-      popup_(NULL),
-      ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
+      popup_(NULL) {
   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));
   }
-
-  registrar_.Add(this, NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE,
-                 Source<Profile>(profile_));
 }
 
 LocationBarView::PageActionImageView::~PageActionImageView() {
   if (tracker_)
     tracker_->StopTrackingImageLoad();
 
   if (popup_)
     HidePopup();
 }
 
-void LocationBarView::PageActionImageView::ExecuteAction(int button) {
+void LocationBarView::PageActionImageView::ExecuteAction(int button,
+    bool inspect_with_devtools) {
   if (current_tab_id_ < 0) {
     NOTREACHED() << "No current tab.";
     return;
   }
 
   if (page_action_->HasPopup(current_tab_id_)) {
     // 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.
@@ skipping 19 matching lines @@
     rect.set_y(origin.y());
 
     popup_ = ExtensionPopup::Show(
         page_action_->GetPopupUrl(current_tab_id_),
         browser,
         browser->profile(),
         browser->window()->GetNativeHandle(),
         rect,
         BubbleBorder::TOP_RIGHT,
         true,  // Activate the popup window.
-        ExtensionPopup::BUBBLE_CHROME);
-    popup_->set_delegate(this);
+        inspect_with_devtools,
+        ExtensionPopup::BUBBLE_CHROME,
+        this);  // ExtensionPopup::Observer
   } 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 25 matching lines @@
     ConvertPointToScreen(this, &point);
 
     // Make the menu appear below the button.
     point.Offset(0, height());
 
     Extension* extension = profile_->GetExtensionsService()->GetExtensionById(
         page_action()->extension_id(), false);
 
     if (!context_menu_.get())
       context_menu_.reset(new ExtensionActionContextMenu());
-    context_menu_->Run(extension, point);
+    context_menu_->Run(extension,
+                       extension->page_action(),
+                       this,  // ExtensionActionContextMenuModel::Delegate
+                       profile_->GetPrefs(),
+                       point);
     return;
   }
 
-  ExecuteAction(button);
+  ExecuteAction(button, false);  // inspect_with_devtools
 }
 
 void LocationBarView::PageActionImageView::ShowInfoBubble() {
   ShowInfoBubbleImpl(ASCIIToWide(tooltip_), GetColor(false, TEXT));
 }
 
 void LocationBarView::PageActionImageView::OnImageLoaded(SkBitmap* image,
                                                          size_t index) {
   // We loaded icons()->size() icons, plus one extra if the page action had
   // a default icon.
@@ skipping 57 matching lines @@
           icon = iter->second;
       }
     }
 
     if (!icon.isNull())
       SetImage(&icon);
   }
   SetVisible(visible);
 }
 
-void LocationBarView::PageActionImageView::BubbleBrowserWindowClosing(
-    BrowserBubble* bubble) {
-  HidePopup();
+void LocationBarView::PageActionImageView::ShowPopupForDevToolsWindow(
+    Extension* extension, ExtensionAction* extension_action) {
+  ExecuteAction(1,  // left-click
+                true);  // inspect_with_devtools
 }
 
-void LocationBarView::PageActionImageView::BubbleLostFocus(
-    BrowserBubble* bubble, bool lost_focus_to_child) {
-  // Don't close when we are losing focus to a child window, this is the case
-  // for select popups and alert for example.
-  if (!popup_ || lost_focus_to_child)
-    return;
-
-  MessageLoop::current()->PostTask(FROM_HERE,
-      method_factory_.NewRunnableMethod(
-          &LocationBarView::PageActionImageView::HidePopup));
+void LocationBarView::PageActionImageView::ExtensionPopupClosed(
+    ExtensionPopup* popup) {
+  DCHECK_EQ(popup_, popup);
+  // ExtensionPopup is ref-counted, so we don't need to delete it.
+  popup_ = NULL;
 }
 
 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;
-}
-
-void LocationBarView::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 (!popup_ || Details<ExtensionHost>(popup_->host()) != details)
-        return;
-
-      HidePopup();
-      break;
-    default:
-      NOTREACHED() << "Unexpected notification";
-      break;
-  }
+  if (popup_)
+    popup_->Close();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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 68 matching lines @@
   NOTREACHED();
   return NULL;
 }
 
 void LocationBarView::TestPageActionPressed(size_t index) {
   size_t current = 0;
   for (size_t i = 0; i < page_action_views_.size(); ++i) {
     if (page_action_views_[i]->IsVisible()) {
       if (current == index) {
         const int kLeftMouseButton = 1;
-        page_action_views_[i]->image_view()->ExecuteAction(kLeftMouseButton);
+        page_action_views_[i]->image_view()->ExecuteAction(kLeftMouseButton,
+            false);  // inspect_with_devtools
         return;
       }
       ++current;
     }
   }
 
   NOTREACHED();
 }