Add infrastructure for Chrome Actions

chrome/browser/ui/views/location_bar/page_action_image_view.h

Index: chrome/browser/ui/views/location_bar/page_action_image_view.h
diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.h b/chrome/browser/ui/views/location_bar/page_action_image_view.h
index 8796663a1f6d7eb452afb2e4db0ec18e00d6a025..bbb2c5940c04cb5dcfb63ad0c98b3c5ccd3e82f6 100644
--- a/chrome/browser/ui/views/location_bar/page_action_image_view.h
+++ b/chrome/browser/ui/views/location_bar/page_action_image_view.h
@@ -9,7 +9,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/views/extensions/extension_action_view_controller.h"
-#include "chrome/browser/ui/views/extensions/extension_action_view_delegate.h"
+#include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate.h"
 #include "ui/views/controls/image_view.h"
 
 class Browser;
@@ -22,7 +22,7 @@ class WebContents;
 
 // PageActionImageView is used by the LocationBarView to display the icon for a
 // given PageAction and notify the extension when the icon is clicked.
-class PageActionImageView : public ExtensionActionViewDelegate,
+class PageActionImageView : public ToolbarActionViewDelegate,
                             public views::ImageView {
  public:
   PageActionImageView(LocationBarView* owner,
@@ -69,7 +69,7 @@ class PageActionImageView : public ExtensionActionViewDelegate,
       override;
   virtual views::View* GetReferenceViewForPopup() override;
   virtual views::MenuButton* GetContextMenuButton() override;
-  virtual content::WebContents* GetCurrentWebContents() override;
+  virtual content::WebContents* GetCurrentWebContents() const override;
   virtual void HideActivePopup() override;
 
   // The controller for this ExtensionAction view.