Make a platform-independent ToolbarActionViewController

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

 // Copyright 2013 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.
 
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 
 #include "base/compiler_specific.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
 #include "chrome/browser/ui/view_ids.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/extensions/extension_popup.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar/browser_actions_container_observer.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/extensions/command.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/runtime_data.h"
 #include "extensions/common/feature_switch.h"
 #include "grit/theme_resources.h"
@@ skipping 25 matching lines @@
 ScopedVector<ToolbarActionViewController> GetToolbarActions(
     extensions::ExtensionToolbarModel* model,
     Browser* browser) {
   ScopedVector<ToolbarActionViewController> actions;
 
   // Extension actions come first.
   extensions::ExtensionActionManager* action_manager =
       extensions::ExtensionActionManager::Get(browser->profile());
   const extensions::ExtensionList& toolbar_items = model->toolbar_items();
   for (const scoped_refptr<const Extension>& extension : toolbar_items) {
-    actions.push_back(new ExtensionActionViewController(
+    actions.push_back(new ExtensionActionViewControllerViews(
         extension.get(),
         browser,
         action_manager->GetExtensionAction(*extension)));
   }
 
   // Component actions come second.
   ScopedVector<ToolbarActionViewController> component_actions =
       ComponentToolbarActionsFactory::GetInstance()->
           GetComponentToolbarActions();
   DCHECK(extensions::FeatureSwitch::extension_action_redesign()->IsEnabled() ||
@@ skipping 685 matching lines @@
     DCHECK(browser_action_views_[i]->extension() != extension) <<
            "Asked to add a browser action view for an extension that already "
            "exists.";
   }
 #endif
   if (chevron_)
     chevron_->CloseMenu();
 
   // Add the new browser action to the vector and the view hierarchy.
   BrowserActionView* view = new BrowserActionView(
-      make_scoped_ptr(new ExtensionActionViewController(
+      make_scoped_ptr(new ExtensionActionViewControllerViews(
           extension,
           browser_,
           extensions::ExtensionActionManager::Get(profile_)->
               GetExtensionAction(*extension))),
       browser_,
       this);
   browser_action_views_.insert(browser_action_views_.begin() + index, view);
   AddChildViewAt(view, index);
 
   // If we are still initializing the container, don't bother animating.
@@ skipping 239 matching lines @@
     DCHECK_LE(absolute_model_visible_size, browser_action_views_.size());
     DCHECK_EQ(model_->toolbar_items().size(), browser_action_views_.size());
   }
 #endif
 
   // The overflow displays any icons not shown by the main bar.
   return in_overflow_mode() ?
       model_->toolbar_items().size() - absolute_model_visible_size :
       absolute_model_visible_size;
 }