Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(943)

Unified Diff: chrome/browser/views/extensions/browser_action_overflow_menu_controller.cc

Issue 1001002: Initial support for inspecting extension popups. (Closed)
Patch Set: pre submit Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/views/extensions/browser_action_overflow_menu_controller.cc
diff --git a/chrome/browser/views/extensions/browser_action_overflow_menu_controller.cc b/chrome/browser/views/extensions/browser_action_overflow_menu_controller.cc
index f0bb80dabda5385268a29aaf5069c39b434b3c77..dbee697417dadcc9c0be8d87a41aeafa6c0f9d9c 100644
--- a/chrome/browser/views/extensions/browser_action_overflow_menu_controller.cc
+++ b/chrome/browser/views/extensions/browser_action_overflow_menu_controller.cc
@@ -7,6 +7,7 @@
#include "app/gfx/canvas.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_list.h"
+#include "chrome/browser/profile.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/views/browser_actions_container.h"
#include "chrome/browser/views/extensions/browser_action_drag_data.h"
@@ -80,7 +81,8 @@ void BrowserActionOverflowMenuController::CancelMenu() {
void BrowserActionOverflowMenuController::ExecuteCommand(int id) {
BrowserActionView* view = (*views_)[start_index_ + id - 1];
- owner_->OnBrowserActionExecuted(view->button());
+ owner_->OnBrowserActionExecuted(view->button(),
+ false); // inspect_with_devtools
}
bool BrowserActionOverflowMenuController::ShowContextMenu(
@@ -90,7 +92,11 @@ bool BrowserActionOverflowMenuController::ShowContextMenu(
bool is_mouse_gesture) {
// This blocks until the user choses something or dismisses the menu.
owner_->GetContextMenu()->Run(
- (*views_)[start_index_ + id - 1]->button()->extension(), p);
+ (*views_)[start_index_ + id - 1]->button()->extension(),
+ (*views_)[start_index_ + id - 1]->button()->extension()->browser_action(),
+ owner_,
+ owner_->profile()->GetPrefs(),
+ p);
// The user is done with the context menu, so we can close the underlying
// menu.
« no previous file with comments | « chrome/browser/views/browser_actions_container.cc ('k') | chrome/browser/views/extensions/extension_action_context_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698