Merge 34812 - Add the rightclick context menu for Browser actions and Page Ac...

chrome/browser/views/location_bar_view.h

Index: chrome/browser/views/location_bar_view.h
===================================================================
--- chrome/browser/views/location_bar_view.h	(revision 34849)
+++ chrome/browser/views/location_bar_view.h	(working copy)
@@ -18,6 +18,7 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/browser/views/browser_bubble.h"
+#include "chrome/browser/views/extensions/extension_action_context_menu.h"
 #include "chrome/browser/views/info_bubble.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
@@ -427,6 +428,9 @@
     typedef std::map<std::string, SkBitmap> PageActionMap;
     PageActionMap page_action_icons_;
 
+    // The context menu for this page action.
+    scoped_ptr<ExtensionActionContextMenu> context_menu_;
+
     // The object that is waiting for the image loading to complete
     // asynchronously.
     ImageLoadingTracker* tracker_;