Support Component Actions in the toolbar.

chrome/browser/ui/toolbar/toolbar_actions_model_factory.cc

Index: chrome/browser/ui/toolbar/toolbar_actions_model_factory.cc
diff --git a/chrome/browser/extensions/extension_toolbar_model_factory.cc b/chrome/browser/ui/toolbar/toolbar_actions_model_factory.cc
similarity index 43%
rename from chrome/browser/extensions/extension_toolbar_model_factory.cc
rename to chrome/browser/ui/toolbar/toolbar_actions_model_factory.cc
index a51904c8686492bcca781c1cda92c1548f78fef4..b6e80eeea066d71015d5d8b16a81c9e489a26582 100644
--- a/chrome/browser/extensions/extension_toolbar_model_factory.cc
+++ b/chrome/browser/ui/toolbar/toolbar_actions_model_factory.cc
@@ -2,58 +2,54 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/extensions/extension_toolbar_model_factory.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_model_factory.h"
 
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
-#include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_prefs_factory.h"
 #include "extensions/browser/extensions_browser_client.h"
 
-namespace extensions {
-
 // static
-ExtensionToolbarModel* ExtensionToolbarModelFactory::GetForProfile(
+ToolbarActionsModel* ToolbarActionsModelFactory::GetForProfile(
     Profile* profile) {
-  return static_cast<ExtensionToolbarModel*>(
+  return static_cast<ToolbarActionsModel*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 // static
-ExtensionToolbarModelFactory* ExtensionToolbarModelFactory::GetInstance() {
-  return Singleton<ExtensionToolbarModelFactory>::get();
+ToolbarActionsModelFactory* ToolbarActionsModelFactory::GetInstance() {
+  return Singleton<ToolbarActionsModelFactory>::get();
 }
 
-ExtensionToolbarModelFactory::ExtensionToolbarModelFactory()
+ToolbarActionsModelFactory::ToolbarActionsModelFactory()
     : BrowserContextKeyedServiceFactory(
-        "ExtensionToolbarModel",
-        BrowserContextDependencyManager::GetInstance()) {
-  DependsOn(ExtensionPrefsFactory::GetInstance());
-  DependsOn(ExtensionActionAPI::GetFactoryInstance());
+          "ToolbarActionsModel",
+          BrowserContextDependencyManager::GetInstance()) {
+  DependsOn(extensions::ExtensionPrefsFactory::GetInstance());
+  DependsOn(extensions::ExtensionActionAPI::GetFactoryInstance());
 }
 
-ExtensionToolbarModelFactory::~ExtensionToolbarModelFactory() {}
+ToolbarActionsModelFactory::~ToolbarActionsModelFactory() {}
 
-KeyedService* ExtensionToolbarModelFactory::BuildServiceInstanceFor(
+KeyedService* ToolbarActionsModelFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
-  return new ExtensionToolbarModel(
+  return new ToolbarActionsModel(
       Profile::FromBrowserContext(context),
-      ExtensionPrefsFactory::GetForBrowserContext(context));
+      extensions::ExtensionPrefsFactory::GetForBrowserContext(context));
 }
 
-content::BrowserContext* ExtensionToolbarModelFactory::GetBrowserContextToUse(
+content::BrowserContext* ToolbarActionsModelFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return context;
 }
 
-bool ExtensionToolbarModelFactory::ServiceIsCreatedWithBrowserContext() const {
+bool ToolbarActionsModelFactory::ServiceIsCreatedWithBrowserContext() const {
   return true;
 }
 
-bool ExtensionToolbarModelFactory::ServiceIsNULLWhileTesting() const {
+bool ToolbarActionsModelFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }
-
-}  // namespace extensions