Make a platform-independent ToolbarActionViewController

chrome/browser/ui/views/toolbar/chevron_menu_button.cc

Index: chrome/browser/ui/views/toolbar/chevron_menu_button.cc
diff --git a/chrome/browser/ui/views/toolbar/chevron_menu_button.cc b/chrome/browser/ui/views/toolbar/chevron_menu_button.cc
index 66d000fa5f72bb69a12e34e32e918dd0f553666d..5c65ddb66db5537fe7550c6b3cdeaddd705cfff1 100644
--- a/chrome/browser/ui/views/toolbar/chevron_menu_button.cc
+++ b/chrome/browser/ui/views/toolbar/chevron_menu_button.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
-#include "chrome/browser/ui/views/extensions/extension_action_view_controller.h"
+#include "chrome/browser/ui/views/extensions/extension_action_view_controller_views.h"
 #include "chrome/browser/ui/views/toolbar/browser_action_view.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 #include "extensions/common/extension.h"
@@ -36,7 +36,7 @@ namespace {
 class IconUpdater : public ExtensionActionIconFactory::Observer {
  public:
   IconUpdater(views::MenuItemView* menu_item_view,
-              ExtensionActionViewController* view_controller)
+              ExtensionActionViewControllerViews* view_controller)
       : menu_item_view_(menu_item_view),
         view_controller_(view_controller) {
     DCHECK(menu_item_view);
@@ -58,7 +58,7 @@ class IconUpdater : public ExtensionActionIconFactory::Observer {
 
   // The view controller to be observed. When its icon changes, update the
   // corresponding menu item view's icon.
-  ExtensionActionViewController* view_controller_;
+  ExtensionActionViewControllerViews* view_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(IconUpdater);
 };
@@ -160,19 +160,20 @@ ChevronMenuButton::MenuController::MenuController(
        i < browser_actions_container_->num_browser_actions(); ++i) {
     BrowserActionView* view =
         browser_actions_container_->GetBrowserActionViewAt(i);
-    ExtensionActionViewController* view_controller =
-        static_cast<ExtensionActionViewController*>(view->view_controller());
     views::MenuItemView* menu_item = menu_->AppendMenuItemWithIcon(
         command_id,
-        base::UTF8ToUTF16(view_controller->extension()->name()),
-        view_controller->GetIconWithBadge());
+        view->view_controller()->GetActionName(),
+        view->view_controller()->GetIconWithBadge());
 
     // Set the tooltip for this item.
     menu_->SetTooltip(
-        view_controller->GetTooltip(view->GetCurrentWebContents()),
+        view->view_controller()->GetTooltip(view->GetCurrentWebContents()),
         command_id);
 
-    icon_updaters_.push_back(new IconUpdater(menu_item, view_controller));
+    icon_updaters_.push_back(new IconUpdater(
+        menu_item,
+        static_cast<ExtensionActionViewControllerViews*>(
+            view->view_controller())));
 
     ++command_id;
   }
@@ -228,8 +229,8 @@ bool ChevronMenuButton::MenuController::ShowContextMenu(
     ui::MenuSourceType source_type) {
   BrowserActionView* view = browser_actions_container_->GetBrowserActionViewAt(
       start_index_ + id - 1);
-  ExtensionActionViewController* view_controller =
-      static_cast<ExtensionActionViewController*>(view->view_controller());
+  ExtensionActionViewControllerViews* view_controller =
+      static_cast<ExtensionActionViewControllerViews*>(view->view_controller());
   if (!view_controller->extension()->ShowConfigureContextMenus())
     return false;