Add infrastructure for Chrome Actions

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

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_
 
 #include <string>
 
 #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;
 class ExtensionAction;
 class LocationBarView;
 
 namespace content {
 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,
                       ExtensionAction* page_action,
                       Browser* browser);
   virtual ~PageActionImageView();
 
   void set_preview_enabled(bool preview_enabled) {
     preview_enabled_ = preview_enabled;
   }
@@ skipping 16 matching lines @@
   // visible or hidden. |contents| is the WebContents that is active.
   void UpdateVisibility(content::WebContents* contents);
 
  private:
   static const char kViewClassName[];
 
   // Overridden from View.
   virtual void PaintChildren(gfx::Canvas* canvas,
                              const views::CullSet& cull_set) override;
 
   // Overridden from ExtensionActionViewDelegate:

[Finnur, 2014/10/17 09:57:02]

You are removing that class, so make sure to update the comments (there are
still a few stragglers around, I believe).

[Devlin, 2014/10/17 16:33:33]

Updated.

   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()
       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.
   scoped_ptr<ExtensionActionViewController> view_controller_;
 
   // The location bar view that owns us.
   LocationBarView* owner_;
 
   // The string to show for a tooltip;
   std::string tooltip_;
 
   // This is used for post-install visual feedback. The page_action icon is
   // briefly shown even if it hasn't been enabled by its extension.
   bool preview_enabled_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(PageActionImageView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_