Support Component Actions in the toolbar.

chrome/browser/extensions/api/extension_action/extension_action_api.cc

 // 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.
 
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/active_script_controller.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
-#include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_function_registry.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/notification_types.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/image_util.h"
@@ skipping 185 matching lines @@
   if (!extension_action)
     return false;
 
   if (extension_action->action_type() == ActionInfo::TYPE_PAGE &&
       !FeatureSwitch::extension_action_redesign()->IsEnabled()) {
     // We show page actions in the location bar unless the new toolbar is
     // enabled.
     return browser->window()->GetLocationBar()->ShowPageActionPopup(
         extension, grant_active_tab_permissions);
   } else {
-    return ExtensionToolbarModel::Get(browser->profile())->
-        ShowExtensionActionPopup(
-            extension, browser, grant_active_tab_permissions);
+    return ToolbarActionsModel::Get(browser->profile())
+        ->ShowToolbarActionPopup(extension->id(), browser,
+                                 grant_active_tab_permissions);
   }
 }
 
 bool ExtensionActionAPI::ExtensionWantsToRun(
     const Extension* extension, content::WebContents* web_contents) {
   // An extension wants to act if it has a visible page action on the given
   // page...
   ExtensionAction* page_action =
       ExtensionActionManager::Get(browser_context_)->GetPageAction(*extension);
   if (page_action &&
@@ skipping 436 matching lines @@
   if (host->extension_host_type() != VIEW_TYPE_EXTENSION_POPUP ||
       host->extension()->id() != extension_->id())
     return;
 
   SendResponse(true);
   response_sent_ = true;
   registrar_.RemoveAll();
 }
 
 }  // namespace extensions