Make a platform-independent ToolbarActionViewController

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 576468bb0668543591642117b51421e5a2722e49..821f5f8127a39e2c9b8671459f9ead4648ea2ead 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
@@ -8,8 +8,8 @@
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/ui/views/extensions/extension_action_view_controller.h"
-#include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate.h"
+#include "chrome/browser/ui/views/extensions/extension_action_view_controller_views.h"
+#include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h"
 #include "ui/views/controls/image_view.h"
 
 class Browser;
@@ -22,13 +22,13 @@ 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 ToolbarActionViewDelegate,
+class PageActionImageView : public ToolbarActionViewDelegateViews,
                             public views::ImageView {
  public:
   PageActionImageView(LocationBarView* owner,
                       ExtensionAction* page_action,
                       Browser* browser);
-  virtual ~PageActionImageView();
+  ~PageActionImageView() override;
 
   void set_preview_enabled(bool preview_enabled) {
     preview_enabled_ = preview_enabled;
@@ -36,17 +36,17 @@ class PageActionImageView : public ToolbarActionViewDelegate,
   ExtensionAction* extension_action() {
     return view_controller_->extension_action();
   }
-  ExtensionActionViewController* view_controller() {
+  ExtensionActionViewControllerViews* view_controller() {
     return view_controller_.get();
   }
 
   // Overridden from views::View:
-  virtual const char* GetClassName() const override;
-  virtual void GetAccessibleState(ui::AXViewState* state) override;
-  virtual bool OnMousePressed(const ui::MouseEvent& event) override;
-  virtual void OnMouseReleased(const ui::MouseEvent& event) override;
-  virtual bool OnKeyPressed(const ui::KeyEvent& event) override;
-  virtual void OnGestureEvent(ui::GestureEvent* event) override;
+  const char* GetClassName() const override;
+  void GetAccessibleState(ui::AXViewState* state) override;
+  bool OnMousePressed(const ui::MouseEvent& event) override;
+  void OnMouseReleased(const ui::MouseEvent& event) override;
+  bool OnKeyPressed(const ui::KeyEvent& event) override;
+  void OnGestureEvent(ui::GestureEvent* event) override;
 
   // Called to notify the PageAction that it should determine whether to be
   // visible or hidden. |contents| is the WebContents that is active.
@@ -56,24 +56,24 @@ class PageActionImageView : public ToolbarActionViewDelegate,
   static const char kViewClassName[];
 
   // Overridden from View.
-  virtual void PaintChildren(gfx::Canvas* canvas,
-                             const views::CullSet& cull_set) override;
-
-  // ToolbarActionViewDelegate:
-  virtual void OnIconUpdated() override;
-  virtual views::View* GetAsView() override;
-  virtual bool IsShownInMenu() override;
-  virtual views::FocusManager* GetFocusManagerForAccelerator() override;
-  virtual views::Widget* GetParentForContextMenu() override;
-  virtual ExtensionActionViewController* GetPreferredPopupViewController()
+  void PaintChildren(gfx::Canvas* canvas,
+                     const views::CullSet& cull_set) override;
+
+  // ToolbarActionViewDelegateViews:
+  void UpdateState() override;
+  views::View* GetAsView() override;
+  bool IsShownInMenu() override;
+  views::FocusManager* GetFocusManagerForAccelerator() override;
+  views::Widget* GetParentForContextMenu() override;
+  ExtensionActionViewControllerViews* GetPreferredPopupViewController()
       override;
-  virtual views::View* GetReferenceViewForPopup() override;
-  virtual views::MenuButton* GetContextMenuButton() override;
-  virtual content::WebContents* GetCurrentWebContents() const override;
-  virtual void HideActivePopup() override;
+  views::View* GetReferenceViewForPopup() override;
+  views::MenuButton* GetContextMenuButton() override;
+  content::WebContents* GetCurrentWebContents() const override;
+  void HideActivePopup() override;
 
   // The controller for this ExtensionAction view.
-  scoped_ptr<ExtensionActionViewController> view_controller_;
+  scoped_ptr<ExtensionActionViewControllerViews> view_controller_;
 
   // The location bar view that owns us.
   LocationBarView* owner_;