Move extension command files to the api folder, as requested in previous review (see https://chromiumcodereview.appspot.com/10201016/diff/42002/chrome/browser/extensions/extension_command_service.h#newcode1).

BUG=121419
TEST=None (no code change).
Review URL: https://chromiumcodereview.appspot.com/10353008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135130 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 29 insertions, 29 deletions

diff --git a/chrome/browser/extensions/extension_command_service.cc b/chrome/browser/extensions/api/commands/extension_command_service.cc
index 4dadb8c..6f66ba6 100644
--- a/chrome/browser/extensions/extension_command_service.cc
+++ b/chrome/browser/extensions/api/commands/extension_command_service.cc
@@ -2,7 +2,7 @@
 // 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_command_service.h"
+#include "chrome/browser/extensions/api/commands/extension_command_service.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
diff --git a/chrome/browser/extensions/extension_command_service.h b/chrome/browser/extensions/api/commands/extension_command_service.h
index 330946f..b771a21 100644
--- a/chrome/browser/extensions/extension_command_service.h
+++ b/chrome/browser/extensions/api/commands/extension_command_service.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_COMMAND_SERVICE_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_COMMAND_SERVICE_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_API_COMMANDS_EXTENSION_COMMAND_SERVICE_H_
+#define CHROME_BROWSER_EXTENSIONS_API_COMMANDS_EXTENSION_COMMAND_SERVICE_H_
 #pragma once
 
 #include <string>
@@ -100,4 +100,4 @@ class ExtensionCommandService : public ProfileKeyedService,
   DISALLOW_COPY_AND_ASSIGN(ExtensionCommandService);
 };
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_COMMAND_SERVICE_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_API_COMMANDS_EXTENSION_COMMAND_SERVICE_H_
diff --git a/chrome/browser/extensions/extension_command_service_factory.cc b/chrome/browser/extensions/api/commands/extension_command_service_factory.cc
index 66338d9..bdbec84 100644
--- a/chrome/browser/extensions/extension_command_service_factory.cc
+++ b/chrome/browser/extensions/api/commands/extension_command_service_factory.cc
@@ -2,9 +2,9 @@
 // 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_command_service_factory.h"
+#include "chrome/browser/extensions/api/commands/extension_command_service_factory.h"
 
-#include "chrome/browser/extensions/extension_command_service.h"
+#include "chrome/browser/extensions/api/commands/extension_command_service.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 
diff --git a/chrome/browser/extensions/extension_command_service_factory.h b/chrome/browser/extensions/api/commands/extension_command_service_factory.h
index 73a7baa..1559016 100644
--- a/chrome/browser/extensions/extension_command_service_factory.h
+++ b/chrome/browser/extensions/api/commands/extension_command_service_factory.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_COMMAND_SERVICE_FACTORY_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_COMMAND_SERVICE_FACTORY_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_API_COMMANDS_EXTENSION_COMMAND_SERVICE_FACTORY_H_
+#define CHROME_BROWSER_EXTENSIONS_API_COMMANDS_EXTENSION_COMMAND_SERVICE_FACTORY_H_
 #pragma once
 
 #include "base/memory/singleton.h"
@@ -35,4 +35,4 @@ class ExtensionCommandServiceFactory : public ProfileKeyedServiceFactory {
   DISALLOW_COPY_AND_ASSIGN(ExtensionCommandServiceFactory);
 };
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_COMMAND_SERVICE_FACTORY_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_API_COMMANDS_EXTENSION_COMMAND_SERVICE_FACTORY_H_
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 191fac9..e61345c 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -15,9 +15,9 @@
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/download/download_prefs.h"
+#include "chrome/browser/extensions/api/commands/extension_command_service.h"
 #include "chrome/browser/extensions/apps_promo.h"
 #include "chrome/browser/extensions/component_loader.h"
-#include "chrome/browser/extensions/extension_command_service.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
diff --git a/chrome/browser/profiles/profile_dependency_manager.cc b/chrome/browser/profiles/profile_dependency_manager.cc
index 1261d1a..c4057be 100644
--- a/chrome/browser/profiles/profile_dependency_manager.cc
+++ b/chrome/browser/profiles/profile_dependency_manager.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/download/download_service_factory.h"
-#include "chrome/browser/extensions/extension_command_service_factory.h"
+#include "chrome/browser/extensions/api/commands/extension_command_service_factory.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/intents/web_intents_registry_factory.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
index ba7864a..ec059c0 100644
--- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc
@@ -13,9 +13,9 @@
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/extensions/api/commands/extension_command_service.h"
+#include "chrome/browser/extensions/api/commands/extension_command_service_factory.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
-#include "chrome/browser/extensions/extension_command_service.h"
-#include "chrome/browser/extensions/extension_command_service_factory.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
diff --git a/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc
index 822f608..9d0fcf3 100644
--- a/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc
+++ b/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h"
 
+#include "chrome/browser/extensions/api/commands/extension_command_service.h"
+#include "chrome/browser/extensions/api/commands/extension_command_service_factory.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
-#include "chrome/browser/extensions/extension_command_service.h"
-#include "chrome/browser/extensions/extension_command_service_factory.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension.h"
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
index fc4c721..177987b 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
@@ -24,9 +24,9 @@
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/defaults.h"
+#include "chrome/browser/extensions/api/commands/extension_command_service.h"
+#include "chrome/browser/extensions/api/commands/extension_command_service_factory.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
-#include "chrome/browser/extensions/extension_command_service.h"
-#include "chrome/browser/extensions/extension_command_service_factory.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc
index 1e279c0d..07651b7 100644
--- a/chrome/browser/ui/views/browser_actions_container.cc
+++ b/chrome/browser/ui/views/browser_actions_container.cc
@@ -8,9 +8,9 @@
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/extensions/api/commands/extension_command_service.h"
+#include "chrome/browser/extensions/api/commands/extension_command_service_factory.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
-#include "chrome/browser/extensions/extension_command_service.h"
-#include "chrome/browser/extensions/extension_command_service_factory.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
index 5e1657f..2c16049 100644
--- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
+++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc
@@ -11,8 +11,8 @@
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/extensions/extension_command_service.h"
-#include "chrome/browser/extensions/extension_command_service_factory.h"
+#include "chrome/browser/extensions/api/commands/extension_command_service.h"
+#include "chrome/browser/extensions/api/commands/extension_command_service_factory.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc b/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
index 403329e..bd7b241 100644
--- a/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
+++ b/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
 
+#include "chrome/browser/extensions/api/commands/extension_command_service.h"
+#include "chrome/browser/extensions/api/commands/extension_command_service_factory.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
-#include "chrome/browser/extensions/extension_command_service.h"
-#include "chrome/browser/extensions/extension_command_service_factory.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension.h"
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 60d6f0b..33603e1 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
@@ -5,9 +5,9 @@
 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
 
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/extensions/api/commands/extension_command_service.h"
+#include "chrome/browser/extensions/api/commands/extension_command_service_factory.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
-#include "chrome/browser/extensions/extension_command_service.h"
-#include "chrome/browser/extensions/extension_command_service_factory.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 39c51a6..c4c81f6 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -70,6 +70,10 @@
         'browser/extensions/api/bluetooth/bluetooth_api.h',
         'browser/extensions/api/browsing_data/browsing_data_api.cc',
         'browser/extensions/api/browsing_data/browsing_data_api.h',
+        'browser/extensions/api/commands/extension_command_service.cc',
+        'browser/extensions/api/commands/extension_command_service.h',
+        'browser/extensions/api/commands/extension_command_service_factory.cc',
+        'browser/extensions/api/commands/extension_command_service_factory.h',
         'browser/extensions/api/declarative/declarative_api.cc',
         'browser/extensions/api/declarative/declarative_api.h',
         'browser/extensions/api/declarative/declarative_constants.cc',
@@ -210,10 +214,6 @@
         'browser/extensions/extension_activity_log.h',
         'browser/extensions/extension_browser_event_router.cc',
         'browser/extensions/extension_browser_event_router.h',
-        'browser/extensions/extension_command_service.cc',
-        'browser/extensions/extension_command_service.h',
-        'browser/extensions/extension_command_service_factory.cc',
-        'browser/extensions/extension_command_service_factory.h',
         'browser/extensions/extension_content_settings_api_constants.cc',
         'browser/extensions/extension_content_settings_api_constants.h',
         'browser/extensions/extension_content_settings_helpers.cc',