Make a platform-independent ToolbarActionViewController

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

Index: chrome/browser/ui/views/location_bar/page_action_image_view.cc
diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.cc b/chrome/browser/ui/views/location_bar/page_action_image_view.cc
index 1c59eeb26d8b29c9344a817d9e55a322d10ea49f..27e7563d24b95a20297d8b24e366d772a320fc7b 100644
--- a/chrome/browser/ui/views/location_bar/page_action_image_view.cc
+++ b/chrome/browser/ui/views/location_bar/page_action_image_view.cc
@@ -23,7 +23,7 @@ const char PageActionImageView::kViewClassName[] = "PageActionImageView";
 PageActionImageView::PageActionImageView(LocationBarView* owner,
                                          ExtensionAction* page_action,
                                          Browser* browser)
-    : view_controller_(new ExtensionActionViewController(
+    : view_controller_(new ExtensionActionViewControllerViews(
           extensions::ExtensionRegistry::Get(browser->profile())->
               enabled_extensions().GetByID(page_action->extension_id()),
           browser,
@@ -117,7 +117,7 @@ void PageActionImageView::PaintChildren(gfx::Canvas* canvas,
   }
 }
 
-void PageActionImageView::OnIconUpdated() {
+void PageActionImageView::UpdateState() {
   UpdateVisibility(GetCurrentWebContents());
 }
 
@@ -137,7 +137,7 @@ views::Widget* PageActionImageView::GetParentForContextMenu() {
   return GetWidget();
 }
 
-ExtensionActionViewController*
+ExtensionActionViewControllerViews*
 PageActionImageView::GetPreferredPopupViewController() {
   return view_controller_.get();
 }