Extension context menu refactor

chrome/browser/gtk/location_bar_view_gtk.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/gtk/location_bar_view_gtk.h"
 
 #include <string>
 
 #include "app/gfx/canvas_paint.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/accessibility_events.h"
 #include "chrome/browser/alternate_nav_url_fetcher.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/content_setting_bubble_model.h"
 #include "chrome/browser/content_setting_image_model.h"
 #include "chrome/browser/extensions/extension_accessibility_api_constants.h"
-#include "chrome/browser/extensions/extension_action_context_menu_model.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/gtk/cairo_cached_surface.h"
 #include "chrome/browser/gtk/content_blocked_bubble_gtk.h"
 #include "chrome/browser/gtk/extension_popup_gtk.h"
 #include "chrome/browser/gtk/first_run_bubble.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/gtk/rounded_window.h"
@@ skipping 94 matching lines @@
 // LocationBarViewGtk
 
 // static
 const GdkColor LocationBarViewGtk::kBackgroundColorByLevel[3] = {
   GDK_COLOR_RGB(255, 245, 195),  // SecurityLevel SECURE: Yellow.
   GDK_COLOR_RGB(255, 255, 255),  // SecurityLevel NORMAL: White.
   GDK_COLOR_RGB(255, 255, 255),  // SecurityLevel INSECURE: White.
 };
 
 LocationBarViewGtk::LocationBarViewGtk(
-    CommandUpdater* command_updater,
-    ToolbarModel* toolbar_model,
     const BubblePositioner* bubble_positioner,
     Browser* browser)
     : security_icon_event_box_(NULL),
       security_lock_icon_image_(NULL),
       security_warning_icon_image_(NULL),
       info_label_(NULL),
       tab_to_search_box_(NULL),
       tab_to_search_full_label_(NULL),
       tab_to_search_partial_label_(NULL),
       tab_to_search_hint_(NULL),
       tab_to_search_hint_leading_label_(NULL),
       tab_to_search_hint_icon_(NULL),
       tab_to_search_hint_trailing_label_(NULL),
       type_to_search_hint_(NULL),
       profile_(NULL),
-      command_updater_(command_updater),
-      toolbar_model_(toolbar_model),
+      command_updater_(browser->command_updater()),
+      toolbar_model_(browser->toolbar_model()),
       browser_(browser),
       bubble_positioner_(bubble_positioner),
       disposition_(CURRENT_TAB),
       transition_(PageTransition::TYPED),
       first_run_bubble_(this),
       popup_window_mode_(false),
       theme_provider_(NULL),
       entry_box_width_(0),
       show_selected_keyword_(false),
       show_keyword_hint_(false),
@@ skipping 1019 matching lines @@
 
   owner_->UpdatePageActions();
 }
 
 void LocationBarViewGtk::PageActionViewGtk::TestActivatePageAction() {
   GdkEvent event;
   event.button.button = 1;
   OnButtonPressed(widget(), &event);
 }
 
+void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
+    ExtensionAction* action) {
+  // TODO(estade): http://crbug.com/24477
+  NOTIMPLEMENTED();
+}
+
 gboolean LocationBarViewGtk::PageActionViewGtk::OnButtonPressed(
     GtkWidget* sender,
     GdkEvent* event) {
   if (event->button.button != 3) {
     if (page_action_->HasPopup(current_tab_id_)) {
       ExtensionPopupGtk::Show(
           page_action_->GetPopupUrl(current_tab_id_),
           owner_->browser_,
           gtk_util::GetWidgetRectRelativeToToplevel(event_box_.get()));
     } else {
       ExtensionBrowserEventRouter::GetInstance()->PageActionExecuted(
           profile_,
           page_action_->extension_id(),
           page_action_->id(),
           current_tab_id_,
           current_url_.spec(),
           event->button.button);
     }
   } else {
     Extension* extension = profile_->GetExtensionsService()->GetExtensionById(
         page_action()->extension_id(), false);
 
-    // TODO(rafaelw): support inspecting popups.
-    if (!context_menu_model_.get())
-      context_menu_model_.reset(new ExtensionActionContextMenuModel(extension,
-          page_action_, profile_->GetPrefs(), NULL));
-
+    context_menu_model_.reset(
+        new ExtensionContextMenuModel(extension, owner_->browser_, this));
     context_menu_.reset(
         new MenuGtk(NULL, context_menu_model_.get()));
     context_menu_->Popup(sender, event);
   }
 
   return TRUE;
 }
 
 gboolean LocationBarViewGtk::PageActionViewGtk::OnExposeEvent(
     GtkWidget* widget, GdkEventExpose* event) {
   TabContents* contents = owner_->GetTabContents();
   if (!contents)
     return FALSE;
 
   int tab_id = ExtensionTabUtil::GetTabId(contents);
   if (tab_id < 0)
     return FALSE;
 
   std::string badge_text = page_action_->GetBadgeText(tab_id);
   if (badge_text.empty())
     return FALSE;
 
   gfx::CanvasPaint canvas(event, false);
   gfx::Rect bounding_rect(widget->allocation);
   page_action_->PaintBadge(&canvas, bounding_rect, tab_id);
   return FALSE;
 }