diff options
568 files changed, 627 insertions, 627 deletions
diff --git a/apps/app_lifetime_monitor.cc b/apps/app_lifetime_monitor.cc index e43fb6b..41d7f6b 100644 --- a/apps/app_lifetime_monitor.cc +++ b/apps/app_lifetime_monitor.cc @@ -8,9 +8,9 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" +#include "extensions/common/extension.h" namespace apps { diff --git a/apps/app_load_service.cc b/apps/app_load_service.cc index c4e24c3..afe99f8 100644 --- a/apps/app_load_service.cc +++ b/apps/app_load_service.cc @@ -14,10 +14,10 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "extensions/common/extension.h" using extensions::Extension; using extensions::ExtensionPrefs; diff --git a/apps/app_restore_service.cc b/apps/app_restore_service.cc index e2d5a85..524ab96 100644 --- a/apps/app_restore_service.cc +++ b/apps/app_restore_service.cc @@ -15,8 +15,8 @@ #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" +#include "extensions/common/extension.h" #if defined(OS_WIN) #include "win8/util/win8_util.h" diff --git a/apps/app_restore_service_browsertest.cc b/apps/app_restore_service_browsertest.cc index 88f7dce..27b179a 100644 --- a/apps/app_restore_service_browsertest.cc +++ b/apps/app_restore_service_browsertest.cc @@ -10,9 +10,9 @@ #include "chrome/browser/extensions/api/file_system/file_system_api.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_test_message_listener.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_utils.h" +#include "extensions/common/extension.h" using extensions::Extension; using extensions::ExtensionPrefs; diff --git a/apps/app_shim/extension_app_shim_handler_mac_unittest.cc b/apps/app_shim/extension_app_shim_handler_mac_unittest.cc index b6a156f..e4f5cb8 100644 --- a/apps/app_shim/extension_app_shim_handler_mac_unittest.cc +++ b/apps/app_shim/extension_app_shim_handler_mac_unittest.cc @@ -9,9 +9,9 @@ #include "apps/app_shim/app_shim_host_mac.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_service.h" +#include "extensions/common/extension.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/apps/launcher.cc b/apps/launcher.cc index 9e0f6cf..220348e 100644 --- a/apps/launcher.cc +++ b/apps/launcher.cc @@ -22,7 +22,6 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/app_runtime.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/manifest_handlers/kiosk_mode_info.h" #include "content/public/browser/browser_thread.h" @@ -30,6 +29,7 @@ #include "content/public/browser/web_contents.h" #include "extensions/browser/lazy_background_task_queue.h" #include "extensions/browser/process_manager.h" +#include "extensions/common/extension.h" #include "net/base/mime_util.h" #include "net/base/net_util.h" #include "url/gurl.h" diff --git a/apps/saved_files_service_unittest.cc b/apps/saved_files_service_unittest.cc index 313c97c..7a467ae 100644 --- a/apps/saved_files_service_unittest.cc +++ b/apps/saved_files_service_unittest.cc @@ -13,8 +13,8 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/test_extension_environment.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/testing_profile.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" #if !defined(OS_ANDROID) diff --git a/apps/shell_window.cc b/apps/shell_window.cc index ed41645..5e4098f 100644 --- a/apps/shell_window.cc +++ b/apps/shell_window.cc @@ -18,7 +18,6 @@ #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "components/web_modal/web_contents_modal_dialog_manager.h" @@ -35,6 +34,7 @@ #include "content/public/common/media_stream_request.h" #include "extensions/browser/process_manager.h" #include "extensions/browser/view_type_utils.h" +#include "extensions/common/extension.h" #include "third_party/skia/include/core/SkRegion.h" #include "ui/gfx/screen.h" diff --git a/apps/shell_window_geometry_cache.cc b/apps/shell_window_geometry_cache.cc index a3b0bcf..add4240 100644 --- a/apps/shell_window_geometry_cache.cc +++ b/apps/shell_window_geometry_cache.cc @@ -12,10 +12,10 @@ #include "chrome/browser/extensions/extension_prefs_factory.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "extensions/common/extension.h" namespace { diff --git a/apps/shell_window_registry.cc b/apps/shell_window_registry.cc index c44b924..b72c131 100644 --- a/apps/shell_window_registry.cc +++ b/apps/shell_window_registry.cc @@ -7,7 +7,6 @@ #include "apps/shell_window_registry.h" #include "apps/ui/native_app_window.h" #include "chrome/browser/profiles/incognito_helpers.h" -#include "chrome/common/extensions/extension.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/devtools_agent_host.h" @@ -16,6 +15,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" namespace { diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm index 641d9cb..4493a6f 100644 --- a/chrome/browser/app_controller_mac_browsertest.mm +++ b/chrome/browser/app_controller_mac_browsertest.mm @@ -17,10 +17,10 @@ #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #import "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" namespace { diff --git a/chrome/browser/apps/app_url_redirector.cc b/chrome/browser/apps/app_url_redirector.cc index b50eea5..c72f982 100644 --- a/chrome/browser/apps/app_url_redirector.cc +++ b/chrome/browser/apps/app_url_redirector.cc @@ -10,7 +10,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_io_data.h" #include "chrome/common/extensions/api/url_handlers/url_handlers_parser.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/extension_set.h" #include "components/navigation_interception/intercept_navigation_resource_throttle.h" @@ -20,6 +19,7 @@ #include "content/public/browser/resource_throttle.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/info_map.h" +#include "extensions/common/extension.h" #include "net/url_request/url_request.h" using content::BrowserThread; diff --git a/chrome/browser/apps/chrome_apps_client.cc b/chrome/browser/apps/chrome_apps_client.cc index d95d139..25d2153 100644 --- a/chrome/browser/apps/chrome_apps_client.cc +++ b/chrome/browser/apps/chrome_apps_client.cc @@ -8,7 +8,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/apps/app_metro_infobar_delegate_win.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #if defined(OS_WIN) #include "win8/util/win8_util.h" diff --git a/chrome/browser/apps/shortcut_manager.h b/chrome/browser/apps/shortcut_manager.h index 4bd5f14..e5cfc14 100644 --- a/chrome/browser/apps/shortcut_manager.h +++ b/chrome/browser/apps/shortcut_manager.h @@ -7,10 +7,10 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/profiles/profile_info_cache_observer.h" -#include "chrome/common/extensions/extension.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "extensions/common/extension.h" class PrefService; class Profile; diff --git a/chrome/browser/apps/web_view_browsertest.cc b/chrome/browser/apps/web_view_browsertest.cc index c253fd1..080fa60 100644 --- a/chrome/browser/apps/web_view_browsertest.cc +++ b/chrome/browser/apps/web_view_browsertest.cc @@ -15,7 +15,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/gpu_data_manager.h" #include "content/public/browser/interstitial_page.h" @@ -26,6 +25,7 @@ #include "content/public/common/content_switches.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/fake_speech_recognition_manager.h" +#include "extensions/common/extension.h" #include "extensions/common/extensions_client.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h" diff --git a/chrome/browser/autocomplete/extension_app_provider.cc b/chrome/browser/autocomplete/extension_app_provider.cc index 56f0fd0..176e747 100644 --- a/chrome/browser/autocomplete/extension_app_provider.cc +++ b/chrome/browser/autocomplete/extension_app_provider.cc @@ -19,9 +19,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" #include "ui/base/l10n/l10n_util.h" ExtensionAppProvider::ExtensionAppProvider( diff --git a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc index f384750..3e9513d 100644 --- a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc +++ b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc @@ -28,11 +28,11 @@ #include "chrome/browser/history/shortcuts_backend.h" #include "chrome/browser/history/shortcuts_backend_factory.h" #include "chrome/browser/history/url_database.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #include "extensions/common/value_builder.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/automation/automation_provider_json.cc b/chrome/browser/automation/automation_provider_json.cc index fd6f12a..4385608 100644 --- a/chrome/browser/automation/automation_provider_json.cc +++ b/chrome/browser/automation/automation_provider_json.cc @@ -14,8 +14,8 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/automation_messages.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" using content::WebContents; diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc index bdd78e2..8fa9e15 100644 --- a/chrome/browser/automation/automation_provider_observers.cc +++ b/chrome/browser/automation/automation_provider_observers.cc @@ -68,7 +68,6 @@ #include "chrome/common/automation_constants.h" #include "chrome/common/automation_messages.h" #include "chrome/common/content_settings_types.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/dom_operation_notification_details.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/notification_service.h" @@ -77,6 +76,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/process_type.h" #include "extensions/browser/process_manager.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/view_type.h" #include "ui/gfx/codec/png_codec.h" diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc index 3d162eb..144ba6e 100644 --- a/chrome/browser/automation/automation_util.cc +++ b/chrome/browser/automation/automation_util.cc @@ -28,13 +28,13 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/process_manager.h" #include "extensions/browser/view_type_utils.h" +#include "extensions/common/extension.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_constants.h" #include "net/cookies/cookie_monster.h" diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 5668635..b020e98 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -112,9 +112,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_url_handler.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "content/public/browser/browser_child_process_host_iterator.h" @@ -138,8 +136,10 @@ #include "content/public/common/webplugininfo.h" #include "extensions/browser/process_manager.h" #include "extensions/browser/view_type_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/permissions/permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/url_pattern.h" #include "extensions/common/url_pattern_set.h" #include "net/cookies/cookie_store.h" diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc index 31302d8..0d950d6 100644 --- a/chrome/browser/background/background_application_list_model.cc +++ b/chrome/browser/background/background_application_list_model.cc @@ -22,12 +22,12 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/image_loader.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/permissions/permission_set.h" diff --git a/chrome/browser/background/background_application_list_model.h b/chrome/browser/background/background_application_list_model.h index 1bc7d2d..0dbc407 100644 --- a/chrome/browser/background/background_application_list_model.h +++ b/chrome/browser/background/background_application_list_model.h @@ -10,9 +10,9 @@ #include "base/basictypes.h" #include "base/observer_list.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "extensions/common/extension.h" class Profile; diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc index a2a0b6d..ed0bc04 100644 --- a/chrome/browser/background/background_application_list_model_unittest.cc +++ b/chrome/browser/background/background_application_list_model_unittest.cc @@ -18,10 +18,10 @@ #include "chrome/browser/extensions/extension_service_unittest.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/permissions_updater.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_types.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/permission_set.h" diff --git a/chrome/browser/background/background_contents_service.cc b/chrome/browser/background/background_contents_service.cc index cee12d0..c305b92 100644 --- a/chrome/browser/background/background_contents_service.cc +++ b/chrome/browser/background/background_contents_service.cc @@ -34,7 +34,6 @@ #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" @@ -42,6 +41,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/background_info.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc index 767fbec..e6cc133 100644 --- a/chrome/browser/background/background_mode_manager.cc +++ b/chrome/browser/background/background_mode_manager.cc @@ -36,12 +36,12 @@ #include "chrome/browser/ui/host_desktop.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" +#include "extensions/common/extension.h" #include "extensions/common/permissions/permission_set.h" #include "grit/chrome_unscaled_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/background/background_mode_manager_aura.cc b/chrome/browser/background/background_mode_manager_aura.cc index d66b6a4..d87377c 100644 --- a/chrome/browser/background/background_mode_manager_aura.cc +++ b/chrome/browser/background/background_mode_manager_aura.cc @@ -4,7 +4,7 @@ #include "chrome/browser/background/background_mode_manager.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/background/background_mode_manager_chromeos.cc b/chrome/browser/background/background_mode_manager_chromeos.cc index a5be498..8f69efb 100644 --- a/chrome/browser/background/background_mode_manager_chromeos.cc +++ b/chrome/browser/background/background_mode_manager_chromeos.cc @@ -4,7 +4,7 @@ #include "chrome/browser/background/background_mode_manager.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 2886537..f51b612 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -90,12 +90,10 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/env_vars.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_process_policy.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" #include "chrome/common/extensions/manifest_handlers/shared_module_info.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/extensions/permissions/socket_permission.h" #include "chrome/common/extensions/web_accessible_resources_handler.h" #include "chrome/common/logging_chrome.h" @@ -129,7 +127,9 @@ #include "extensions/browser/process_manager.h" #include "extensions/browser/view_type_utils.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/background_info.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/switches.h" #include "grit/generated_resources.h" #include "grit/ui_resources.h" diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc index 8326a83..7077002 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc +++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc @@ -34,7 +34,6 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/speech/tts_controller.h" #include "chrome/common/extensions/api/experimental_accessibility.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" #include "chrome/common/pref_names.h" @@ -49,6 +48,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "extensions/browser/file_reader.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc b/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc index 2532fdf..e484bb5 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_update_service_browsertest.cc @@ -25,12 +25,12 @@ #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chromeos/chromeos_paths.h" #include "chromeos/dbus/update_engine_client.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_utils.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" namespace chromeos { diff --git a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc index 4aff6841..68021df 100644 --- a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc +++ b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc @@ -23,10 +23,10 @@ #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/kiosk_mode_info.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" +#include "extensions/common/extension.h" #include "google_apis/gaia/gaia_auth_consumer.h" #include "google_apis/gaia/gaia_constants.h" diff --git a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc index 27a70cd..5662275 100644 --- a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc +++ b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader_unittest.cc @@ -24,7 +24,6 @@ #include "chrome/browser/policy/policy_map.h" #include "chrome/browser/policy/policy_types.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/test/base/testing_browser_process.h" #include "content/public/browser/notification_service.h" @@ -32,6 +31,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/test/test_browser_thread_bundle.h" #include "content/public/test/test_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher_delegate.h" diff --git a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc index edbc9a0..657d1ab 100644 --- a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc +++ b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider_unittest.cc b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider_unittest.cc index 56e5168..8314d6b 100644 --- a/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider_unittest.cc +++ b/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider_unittest.cc @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/extensions/echo_private_api.cc b/chrome/browser/chromeos/extensions/echo_private_api.cc index 1765b6f..cf1c11d 100644 --- a/chrome/browser/chromeos/extensions/echo_private_api.cc +++ b/chrome/browser/chromeos/extensions/echo_private_api.cc @@ -23,10 +23,10 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/extensions/api/echo_private.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chromeos/system/statistics_provider.h" #include "content/public/browser/browser_thread.h" +#include "extensions/common/extension.h" namespace echo_api = extensions::api::echo_private; diff --git a/chrome/browser/chromeos/extensions/external_cache.cc b/chrome/browser/chromeos/extensions/external_cache.cc index ffc3e93..02a115e 100644 --- a/chrome/browser/chromeos/extensions/external_cache.cc +++ b/chrome/browser/chromeos/extensions/external_cache.cc @@ -18,12 +18,12 @@ #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/external_provider_impl.h" #include "chrome/browser/extensions/updater/extension_downloader.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" namespace chromeos { diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc index 5fac57c..5386cc7 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc @@ -15,10 +15,10 @@ #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/browser_context.h" +#include "extensions/common/extension.h" #include "webkit/browser/fileapi/external_mount_points.h" #include "webkit/common/fileapi/file_system_types.h" diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc index 0ebf088..e97b6fe 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc @@ -34,11 +34,11 @@ #include "chrome/browser/google_apis/test_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chromeos/chromeos_switches.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_utils.h" +#include "extensions/common/extension.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "webkit/browser/fileapi/external_mount_points.h" diff --git a/chrome/browser/chromeos/file_manager/zip_file_creator.h b/chrome/browser/chromeos/file_manager/zip_file_creator.h index 193f26c..e456863 100644 --- a/chrome/browser/chromeos/file_manager/zip_file_creator.h +++ b/chrome/browser/chromeos/file_manager/zip_file_creator.h @@ -10,9 +10,9 @@ #include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/platform_file.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/utility_process_host_client.h" +#include "extensions/common/extension.h" namespace file_manager { diff --git a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc index ad45277..ba523b1 100644 --- a/chrome/browser/chromeos/first_run/drive_first_run_controller.cc +++ b/chrome/browser/chromeos/first_run/drive_first_run_controller.cc @@ -18,7 +18,6 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/tab_contents/background_contents.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/notification_details.h" @@ -29,6 +28,7 @@ #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" +#include "extensions/common/extension.h" #include "url/gurl.h" namespace chromeos { diff --git a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc index 3838da2..3a31256 100644 --- a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc +++ b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc @@ -11,10 +11,10 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/extension_l10n_util.h" #include "content/public/browser/browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc index 2df016d..2888d51 100644 --- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc +++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc @@ -22,12 +22,12 @@ #include "chrome/browser/extensions/sandboxed_unpacker.h" #include "chrome/browser/policy/browser_policy_connector.h" #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chromeos/login/login_state.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" +#include "extensions/common/extension.h" using extensions::Extension; using extensions::SandboxedUnpacker; diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc index 1070b4a..fd11881 100644 --- a/chrome/browser/chromeos/login/kiosk_browsertest.cc +++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc @@ -48,7 +48,6 @@ #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/interactive_test_utils.h" @@ -60,6 +59,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" +#include "extensions/common/extension.h" #include "google_apis/gaia/fake_gaia.h" #include "google_apis/gaia/gaia_switches.h" #include "net/base/network_change_notifier.h" diff --git a/chrome/browser/chromeos/login/merge_session_load_page.cc b/chrome/browser/chromeos/login/merge_session_load_page.cc index 0ff337a..0734cda 100644 --- a/chrome/browser/chromeos/login/merge_session_load_page.cc +++ b/chrome/browser/chromeos/login/merge_session_load_page.cc @@ -20,7 +20,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_preferences_util.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/url_constants.h" @@ -28,6 +27,7 @@ #include "content/public/browser/interstitial_page.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "net/base/escape.h" diff --git a/chrome/browser/chromeos/offline/offline_load_page.cc b/chrome/browser/chromeos/offline/offline_load_page.cc index 1b43382..f78a07a 100644 --- a/chrome/browser/chromeos/offline/offline_load_page.cc +++ b/chrome/browser/chromeos/offline/offline_load_page.cc @@ -21,7 +21,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_preferences_util.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" @@ -32,6 +31,7 @@ #include "content/public/browser/interstitial_page.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc index 887b04a..7b8629e 100644 --- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc +++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc @@ -74,7 +74,6 @@ #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chromeos/chromeos_paths.h" #include "chromeos/chromeos_switches.h" #include "chromeos/dbus/cryptohome_client.h" @@ -89,6 +88,7 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_utils.h" #include "crypto/rsa_private_key.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/url_util.h" diff --git a/chrome/browser/chromeos/system_logs/chrome_internal_log_source.cc b/chrome/browser/chromeos/system_logs/chrome_internal_log_source.cc index 8da1cdc..bfe14505 100644 --- a/chrome/browser/chromeos/system_logs/chrome_internal_log_source.cc +++ b/chrome/browser/chromeos/system_logs/chrome_internal_log_source.cc @@ -13,9 +13,9 @@ #include "chrome/browser/sync/about_sync_util.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "content/public/browser/browser_thread.h" +#include "extensions/common/extension.h" namespace { diff --git a/chrome/browser/component_updater/component_updater_service.cc b/chrome/browser/component_updater/component_updater_service.cc index fac15b2..472525b 100644 --- a/chrome/browser/component_updater/component_updater_service.cc +++ b/chrome/browser/component_updater/component_updater_service.cc @@ -29,11 +29,11 @@ #include "chrome/browser/component_updater/component_updater_ping_manager.h" #include "chrome/browser/component_updater/crx_update_item.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/update_manifest.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/resource_controller.h" #include "content/public/browser/resource_throttle.h" +#include "extensions/common/extension.h" #include "net/base/escape.h" #include "net/base/load_flags.h" #include "net/base/net_errors.h" diff --git a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc index 2224674..59f5d33 100644 --- a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc +++ b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc @@ -12,13 +12,13 @@ #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_pattern.h" #include "chrome/common/extensions/api/plugins/plugins_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/features/simple_feature.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" using extensions::UnloadedExtensionInfo; diff --git a/chrome/browser/download/download_item_model_unittest.cc b/chrome/browser/download/download_item_model_unittest.cc index dd708d2..6be4abc 100644 --- a/chrome/browser/download/download_item_model_unittest.cc +++ b/chrome/browser/download/download_item_model_unittest.cc @@ -12,8 +12,8 @@ #include "base/strings/string16.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/common/extensions/extension.h" #include "content/public/test/mock_download_item.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/download/download_shelf_context_menu.cc b/chrome/browser/download/download_shelf_context_menu.cc index a665db3..d1138d2 100644 --- a/chrome/browser/download/download_shelf_context_menu.cc +++ b/chrome/browser/download/download_shelf_context_menu.cc @@ -12,12 +12,12 @@ #include "chrome/browser/safe_browsing/download_feedback_service.h" #include "chrome/browser/safe_browsing/download_protection_service.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/page_navigator.h" #include "content/public/common/content_switches.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/download/download_shelf_unittest.cc b/chrome/browser/download/download_shelf_unittest.cc index c16701b..ca8d0f8 100644 --- a/chrome/browser/download/download_shelf_unittest.cc +++ b/chrome/browser/download/download_shelf_unittest.cc @@ -11,12 +11,12 @@ #include "chrome/browser/download/download_service.h" #include "chrome/browser/download/download_service_factory.h" #include "chrome/browser/download/test_download_shelf.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_service.h" #include "content/public/test/mock_download_item.h" #include "content/public/test/mock_download_manager.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/common/extension.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/download/download_target_determiner_unittest.cc b/chrome/browser/download/download_target_determiner_unittest.cc index 5b4b8f2..d5ecd99 100644 --- a/chrome/browser/download/download_target_determiner_unittest.cc +++ b/chrome/browser/download/download_target_determiner_unittest.cc @@ -20,7 +20,6 @@ #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/history/history_types.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_pref_service_syncable.h" @@ -33,6 +32,7 @@ #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_renderer_host.h" #include "content/public/test/web_contents_tester.h" +#include "extensions/common/extension.h" #include "net/base/mime_util.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/active_tab_apitest.cc b/chrome/browser/extensions/active_tab_apitest.cc index 370b516..3e91b924 100644 --- a/chrome/browser/extensions/active_tab_apitest.cc +++ b/chrome/browser/extensions/active_tab_apitest.cc @@ -6,8 +6,8 @@ #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_toolbar_model.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" +#include "extensions/common/extension.h" #include "net/test/embedded_test_server/embedded_test_server.h" namespace extensions { diff --git a/chrome/browser/extensions/active_tab_permission_granter.cc b/chrome/browser/extensions/active_tab_permission_granter.cc index aebeb39..dd4d3e6 100644 --- a/chrome/browser/extensions/active_tab_permission_granter.cc +++ b/chrome/browser/extensions/active_tab_permission_granter.cc @@ -9,16 +9,16 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_id.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "extensions/common/permissions/permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/user_script.h" using content::RenderProcessHost; diff --git a/chrome/browser/extensions/active_tab_unittest.cc b/chrome/browser/extensions/active_tab_unittest.cc index 67bde7a..150ba60 100644 --- a/chrome/browser/extensions/active_tab_unittest.cc +++ b/chrome/browser/extensions/active_tab_unittest.cc @@ -13,9 +13,7 @@ #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_id.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/features/feature_channel.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_details.h" @@ -26,8 +24,10 @@ #include "content/public/common/frame_navigate_params.h" #include "content/public/common/page_transition_types.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #include "extensions/common/features/feature.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/value_builder.h" using base::DictionaryValue; diff --git a/chrome/browser/extensions/activity_log/activity_database.h b/chrome/browser/extensions/activity_log/activity_database.h index f7216ee..a71dd1c 100644 --- a/chrome/browser/extensions/activity_log/activity_database.h +++ b/chrome/browser/extensions/activity_log/activity_database.h @@ -15,8 +15,8 @@ #include "base/synchronization/lock.h" #include "base/timer/timer.h" #include "chrome/browser/extensions/activity_log/activity_actions.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" +#include "extensions/common/extension.h" #include "sql/connection.h" #include "sql/init_status.h" diff --git a/chrome/browser/extensions/activity_log/activity_log.cc b/chrome/browser/extensions/activity_log/activity_log.cc index a2563c6..1a15030 100644 --- a/chrome/browser/extensions/activity_log/activity_log.cc +++ b/chrome/browser/extensions/activity_log/activity_log.cc @@ -29,10 +29,10 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "third_party/re2/re2/re2.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/activity_log/activity_log_policy.cc b/chrome/browser/extensions/activity_log/activity_log_policy.cc index e16241c..b6954af 100644 --- a/chrome/browser/extensions/activity_log/activity_log_policy.cc +++ b/chrome/browser/extensions/activity_log/activity_log_policy.cc @@ -14,8 +14,8 @@ #include "base/time/time.h" #include "chrome/browser/extensions/activity_log/activity_action_constants.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" +#include "extensions/common/extension.h" #include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc index f4d4143..d6e478b 100644 --- a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc +++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc @@ -18,7 +18,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/dom_action_types.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "sql/error_delegate_util.h" #include "sql/transaction.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/alert_apitest.cc b/chrome/browser/extensions/alert_apitest.cc index 8d55c18..f8742b9 100644 --- a/chrome/browser/extensions/alert_apitest.cc +++ b/chrome/browser/extensions/alert_apitest.cc @@ -9,10 +9,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/render_view_host.h" #include "extensions/browser/process_manager.h" +#include "extensions/common/extension.h" IN_PROC_BROWSER_TEST_F(ExtensionApiTest, AlertBasic) { ASSERT_TRUE(RunExtensionTest("alert")) << message_; diff --git a/chrome/browser/extensions/all_urls_apitest.cc b/chrome/browser/extensions/all_urls_apitest.cc index b43227f..2069001 100644 --- a/chrome/browser/extensions/all_urls_apitest.cc +++ b/chrome/browser/extensions/all_urls_apitest.cc @@ -9,9 +9,9 @@ #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/test_switches.h" #include "chrome/test/base/ui_test_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/extensions_client.h" #include "extensions/common/id_util.h" diff --git a/chrome/browser/extensions/api/api_resource.h b/chrome/browser/extensions/api/api_resource.h index 2911cf3e..f7d4167 100644 --- a/chrome/browser/extensions/api/api_resource.h +++ b/chrome/browser/extensions/api/api_resource.h @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" +#include "extensions/common/extension.h" namespace extensions { diff --git a/chrome/browser/extensions/api/api_resource_manager.h b/chrome/browser/extensions/api/api_resource_manager.h index fab663a..5596cfa 100644 --- a/chrome/browser/extensions/api/api_resource_manager.h +++ b/chrome/browser/extensions/api/api_resource_manager.h @@ -15,12 +15,12 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/common/extensions/extension.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" +#include "extensions/common/extension.h" namespace extensions { namespace api { diff --git a/chrome/browser/extensions/api/api_resource_manager_unittest.cc b/chrome/browser/extensions/api/api_resource_manager_unittest.cc index 725d8fe..7ae4474 100644 --- a/chrome/browser/extensions/api/api_resource_manager_unittest.cc +++ b/chrome/browser/extensions/api/api_resource_manager_unittest.cc @@ -8,10 +8,10 @@ #include "chrome/browser/extensions/api/api_resource_manager.h" #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_test_util.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "content/public/browser/browser_thread.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc b/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc index 2c8c1db..8feaa5c 100644 --- a/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc +++ b/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc @@ -17,8 +17,8 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/app_runtime.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "url/gurl.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc b/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc index 5ac5f86..994337c 100644 --- a/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc +++ b/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc @@ -14,10 +14,10 @@ #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/common/extensions/api/autotest_private.h" #include "chrome/common/extensions/manifest_url_handler.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/permissions/api_permission_set.h" #include "extensions/common/permissions/permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/login/screen_locker.h" diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc index b7fadfd..af06d9a 100644 --- a/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc @@ -16,7 +16,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/bluetooth.h" #include "chrome/common/extensions/permissions/bluetooth_permission.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "content/public/browser/browser_thread.h" #include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/bluetooth_device.h" @@ -25,6 +24,7 @@ #include "device/bluetooth/bluetooth_service_record.h" #include "device/bluetooth/bluetooth_socket.h" #include "device/bluetooth/bluetooth_utils.h" +#include "extensions/common/permissions/permissions_data.h" #include "net/base/io_buffer.h" using device::BluetoothAdapter; diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc index 7078525..573953b1 100644 --- a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc +++ b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc @@ -18,10 +18,10 @@ #include "chrome/browser/plugins/plugin_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/api/commands/command_service.h b/chrome/browser/extensions/api/commands/command_service.h index 8224984..76aa309 100644 --- a/chrome/browser/extensions/api/commands/command_service.h +++ b/chrome/browser/extensions/api/commands/command_service.h @@ -10,11 +10,11 @@ #include "base/basictypes.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" #include "chrome/common/extensions/command.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" class Profile; diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/browser/extensions/api/cookies/cookies_api.cc index aec3117..b26a9ea 100644 --- a/chrome/browser/extensions/api/cookies/cookies_api.cc +++ b/chrome/browser/extensions/api/cookies/cookies_api.cc @@ -24,11 +24,11 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_iterator.h" #include "chrome/common/extensions/api/cookies.h" -#include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" +#include "extensions/common/permissions/permissions_data.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_constants.h" #include "net/cookies/cookie_monster.h" diff --git a/chrome/browser/extensions/api/cookies/cookies_helpers.cc b/chrome/browser/extensions/api/cookies/cookies_helpers.cc index 8ac5990..954bbe9 100644 --- a/chrome/browser/extensions/api/cookies/cookies_helpers.cc +++ b/chrome/browser/extensions/api/cookies/cookies_helpers.cc @@ -20,10 +20,10 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/extensions/api/cookies.h" -#include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" +#include "extensions/common/permissions/permissions_data.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_util.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc index 70cbce9..44769c10 100644 --- a/chrome/browser/extensions/api/debugger/debugger_api.cc +++ b/chrome/browser/extensions/api/debugger/debugger_api.cc @@ -32,7 +32,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/devtools_client_host.h" #include "content/public/browser/devtools_http_handler.h" @@ -46,6 +45,7 @@ #include "content/public/common/content_client.h" #include "content/public/common/url_utils.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/api/declarative/declarative_apitest.cc b/chrome/browser/extensions/api/declarative/declarative_apitest.cc index 056f153..713a146 100644 --- a/chrome/browser/extensions/api/declarative/declarative_apitest.cc +++ b/chrome/browser/extensions/api/declarative/declarative_apitest.cc @@ -15,9 +15,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/browser_thread.h" +#include "extensions/common/extension.h" using extensions::RulesRegistry; using extensions::RulesRegistryService; diff --git a/chrome/browser/extensions/api/declarative/declarative_rule.h b/chrome/browser/extensions/api/declarative/declarative_rule.h index 84dffc2..d51d7e2 100644 --- a/chrome/browser/extensions/api/declarative/declarative_rule.h +++ b/chrome/browser/extensions/api/declarative/declarative_rule.h @@ -21,7 +21,7 @@ #include "base/stl_util.h" #include "base/time/time.h" #include "chrome/common/extensions/api/events.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/matcher/url_matcher.h" namespace base { diff --git a/chrome/browser/extensions/api/declarative/rules_registry.cc b/chrome/browser/extensions/api/declarative/rules_registry.cc index e8b2174..c994963 100644 --- a/chrome/browser/extensions/api/declarative/rules_registry.cc +++ b/chrome/browser/extensions/api/declarative/rules_registry.cc @@ -19,10 +19,10 @@ #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/extensions/state_store.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" namespace { diff --git a/chrome/browser/extensions/api/declarative/rules_registry_service.cc b/chrome/browser/extensions/api/declarative/rules_registry_service.cc index abe3b24..1fd7e0c 100644 --- a/chrome/browser/extensions/api/declarative/rules_registry_service.cc +++ b/chrome/browser/extensions/api/declarative/rules_registry_service.cc @@ -14,12 +14,12 @@ #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h" #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h" #include "chrome/browser/extensions/api/web_request/web_request_api.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/render_process_host.h" +#include "extensions/common/extension.h" namespace extensions { diff --git a/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc b/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc index 96f7efe..749c734 100644 --- a/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc +++ b/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc @@ -16,10 +16,10 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/browser/value_store/testing_value_store.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_test_util.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/extensions/api/declarative_content/content_action.cc b/chrome/browser/extensions/api/declarative_content/content_action.cc index 97ad637..8a68573 100644 --- a/chrome/browser/extensions/api/declarative_content/content_action.cc +++ b/chrome/browser/extensions/api/declarative_content/content_action.cc @@ -15,9 +15,9 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/invalidate_type.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" namespace extensions { diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action.cc index 14c2c8e..f957892 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action.cc +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action.cc @@ -17,9 +17,9 @@ #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h" #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h" #include "chrome/browser/extensions/api/web_request/web_request_permissions.h" -#include "chrome/common/extensions/extension.h" #include "content/public/common/url_constants.h" #include "extensions/browser/info_map.h" +#include "extensions/common/extension.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/url_request/url_request.h" #include "third_party/re2/re2/re2.h" diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc index b2054cb..2de1cc1 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc @@ -18,11 +18,11 @@ #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h" #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_test_util.h" #include "content/public/test/test_browser_thread_bundle.h" #include "extensions/browser/info_map.h" +#include "extensions/common/extension.h" #include "net/base/request_priority.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request_test_util.h" diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc index 4af1429..949796e 100644 --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc @@ -15,9 +15,9 @@ #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h" #include "chrome/browser/extensions/api/web_request/web_request_permissions.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" +#include "extensions/common/permissions/permissions_data.h" #include "net/url_request/url_request.h" namespace { diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc index c6dbad5..fe2c10e 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc @@ -55,8 +55,6 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/common/cancelable_task_tracker.h" #include "chrome/common/extensions/api/downloads.h" -#include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "components/web_modal/web_contents_modal_dialog_manager.h" #include "content/public/browser/download_interrupt_reasons.h" #include "content/public/browser/download_item.h" @@ -73,6 +71,8 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/common/extension.h" +#include "extensions/common/permissions/permissions_data.h" #include "net/base/load_flags.h" #include "net/base/net_util.h" #include "net/http/http_util.h" diff --git a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc index a1b0a3b..1460103 100644 --- a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc +++ b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc @@ -13,10 +13,10 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/permissions/permissions_data.h" namespace extensions { namespace { diff --git a/chrome/browser/extensions/api/extension_action/extension_action_prefs_unittest.cc b/chrome/browser/extensions/api/extension_action/extension_action_prefs_unittest.cc index ab9a865..4c908ee 100644 --- a/chrome/browser/extensions/api/extension_action/extension_action_prefs_unittest.cc +++ b/chrome/browser/extensions/api/extension_action/extension_action_prefs_unittest.cc @@ -9,7 +9,7 @@ #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" #include "chrome/browser/extensions/extension_prefs_unittest.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" namespace extensions { diff --git a/chrome/browser/extensions/api/extension_action/extension_browser_actions_api_unittest.cc b/chrome/browser/extensions/api/extension_action/extension_browser_actions_api_unittest.cc index e6c2a4c..79e99ad 100644 --- a/chrome/browser/extensions/api/extension_action/extension_browser_actions_api_unittest.cc +++ b/chrome/browser/extensions/api/extension_action/extension_browser_actions_api_unittest.cc @@ -6,9 +6,9 @@ #include "base/values.h" #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" -#include "chrome/common/extensions/extension.h" -#include "third_party/skia/include/core/SkColor.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/skia/include/core/SkColor.h" namespace extensions { diff --git a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc index f2d0078..144d3bc 100644 --- a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc @@ -17,10 +17,10 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/common/extension.h" using content::WebContents; diff --git a/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc index 0363c5c..0e186b2 100644 --- a/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc @@ -19,9 +19,9 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" // These are a mash-up of the tests from from page_actions_apitest.cc and diff --git a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc index 9280908..bb4e44b 100644 --- a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc @@ -13,10 +13,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/chrome/browser/extensions/api/file_handlers/app_file_handler_util.h b/chrome/browser/extensions/api/file_handlers/app_file_handler_util.h index a2ab82b..203354b 100644 --- a/chrome/browser/extensions/api/file_handlers/app_file_handler_util.h +++ b/chrome/browser/extensions/api/file_handlers/app_file_handler_util.h @@ -11,7 +11,7 @@ #include <vector> #include "chrome/common/extensions/api/file_handlers/file_handlers_parser.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" class Profile; diff --git a/chrome/browser/extensions/api/i18n/i18n_apitest.cc b/chrome/browser/extensions/api/i18n/i18n_apitest.cc index e6863f6..f6f1ce8 100644 --- a/chrome/browser/extensions/api/i18n/i18n_apitest.cc +++ b/chrome/browser/extensions/api/i18n/i18n_apitest.cc @@ -8,8 +8,8 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" +#include "extensions/common/extension.h" #include "net/test/embedded_test_server/embedded_test_server.h" IN_PROC_BROWSER_TEST_F(ExtensionApiTest, I18N) { diff --git a/chrome/browser/extensions/api/identity/experimental_identity_api.cc b/chrome/browser/extensions/api/identity/experimental_identity_api.cc index 84cea40..ef95801 100644 --- a/chrome/browser/extensions/api/identity/experimental_identity_api.cc +++ b/chrome/browser/extensions/api/identity/experimental_identity_api.cc @@ -22,9 +22,9 @@ #include "chrome/common/extensions/api/experimental_identity.h" #include "chrome/common/extensions/api/identity.h" #include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "content/public/common/page_transition_types.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" #include "google_apis/gaia/gaia_constants.h" #include "ui/base/window_open_disposition.h" diff --git a/chrome/browser/extensions/api/identity/identity_api.cc b/chrome/browser/extensions/api/identity/identity_api.cc index 1850ab0..5955853 100644 --- a/chrome/browser/extensions/api/identity/identity_api.cc +++ b/chrome/browser/extensions/api/identity/identity_api.cc @@ -28,9 +28,9 @@ #include "chrome/browser/signin/signin_global_error.h" #include "chrome/common/extensions/api/identity.h" #include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "extensions/common/extension.h" #include "google_apis/gaia/gaia_urls.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/api/idle/idle_api_unittest.cc b/chrome/browser/extensions/api/idle/idle_api_unittest.cc index 012ef6d..331e0b8 100644 --- a/chrome/browser/extensions/api/idle/idle_api_unittest.cc +++ b/chrome/browser/extensions/api/idle/idle_api_unittest.cc @@ -15,10 +15,10 @@ #include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/common/extensions/api/idle.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/api/idle/idle_manager.cc b/chrome/browser/extensions/api/idle/idle_manager.cc index 0f4b465..461bca1 100644 --- a/chrome/browser/extensions/api/idle/idle_manager.cc +++ b/chrome/browser/extensions/api/idle/idle_manager.cc @@ -13,10 +13,10 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/idle.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" namespace keys = extensions::idle_api_constants; namespace idle = extensions::api::idle; diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.h b/chrome/browser/extensions/api/input_ime/input_ime_api.h index e1c2d25..139be81 100644 --- a/chrome/browser/extensions/api/input_ime/input_ime_api.h +++ b/chrome/browser/extensions/api/input_ime/input_ime_api.h @@ -13,11 +13,11 @@ #include "base/values.h" #include "chrome/browser/chromeos/input_method/input_method_engine.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" -#include "chrome/common/extensions/extension.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "extensions/browser/extension_function.h" +#include "extensions/common/extension.h" class Profile; diff --git a/chrome/browser/extensions/api/location/location_manager.cc b/chrome/browser/extensions/api/location/location_manager.cc index d07591c..5cd2290 100644 --- a/chrome/browser/extensions/api/location/location_manager.cc +++ b/chrome/browser/extensions/api/location/location_manager.cc @@ -14,12 +14,12 @@ #include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/common/extensions/api/location.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/geolocation_provider.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/common/geoposition.h" +#include "extensions/common/extension.h" #include "extensions/common/permissions/permission_set.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/api/management/management_api.cc b/chrome/browser/extensions/api/management/management_api.cc index 94001d4..28b3bdc 100644 --- a/chrome/browser/extensions/api/management/management_api.cc +++ b/chrome/browser/extensions/api/management/management_api.cc @@ -31,20 +31,20 @@ #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" #include "chrome/common/chrome_utility_messages.h" #include "chrome/common/extensions/api/management.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/extensions/manifest_handlers/offline_enabled_info.h" #include "chrome/common/extensions/manifest_url_handler.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/utility_process_host.h" #include "content/public/browser/utility_process_host_client.h" #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/permissions/permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/url_pattern.h" #if !defined(OS_ANDROID) diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc index cc24391..8a4f97e 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc @@ -25,16 +25,16 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/chrome_select_file_policy.h" #include "chrome/common/extensions/api/media_galleries.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/permissions/media_galleries_permission.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/pref_names.h" #include "components/web_modal/web_contents_modal_dialog_manager.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "extensions/common/permissions/api_permission.h" +#include "extensions/common/permissions/permissions_data.h" #if defined(OS_WIN) #include "base/strings/sys_string_conversions.h" diff --git a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc index 2aae953..ea1cc20 100644 --- a/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc +++ b/chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.cc @@ -23,10 +23,10 @@ #include "chrome/browser/media_galleries/media_file_system_registry.h" #include "chrome/browser/media_galleries/media_galleries_preferences.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" +#include "extensions/common/extension.h" namespace extensions { diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc index 79edf1f..04612b6 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_apitest.cc @@ -14,11 +14,11 @@ #include "chrome/browser/storage_monitor/test_storage_monitor.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/common/extension.h" #include "url/gurl.h" namespace { diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc index 1447203..333ab5f 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc @@ -16,8 +16,8 @@ #include "chrome/browser/media_galleries/media_galleries_test_util.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/render_view_host.h" +#include "extensions/common/extension.h" namespace { diff --git a/chrome/browser/extensions/api/messaging/incognito_connectability.cc b/chrome/browser/extensions/api/messaging/incognito_connectability.cc index eca7bd2..d9f41c6 100644 --- a/chrome/browser/extensions/api/messaging/incognito_connectability.cc +++ b/chrome/browser/extensions/api/messaging/incognito_connectability.cc @@ -9,9 +9,9 @@ #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/simple_message_box.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/api/messaging/message_service.cc b/chrome/browser/extensions/api/messaging/message_service.cc index f8b98dd..23cf172 100644 --- a/chrome/browser/extensions/api/messaging/message_service.cc +++ b/chrome/browser/extensions/api/messaging/message_service.cc @@ -23,7 +23,6 @@ #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/manifest_handlers/externally_connectable.h" #include "content/public/browser/notification_service.h" @@ -35,7 +34,7 @@ #include "content/public/browser/web_contents.h" #include "extensions/browser/lazy_background_task_queue.h" #include "extensions/browser/process_manager.h" -#include "extensions/browser/process_map.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/manifest_handlers/incognito_info.h" diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc index dd36d8c..749a790 100644 --- a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc +++ b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc @@ -26,10 +26,10 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/features/feature_channel.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_WIN) diff --git a/chrome/browser/extensions/api/metrics_private/metrics_private_api.cc b/chrome/browser/extensions/api/metrics_private/metrics_private_api.cc index fe4a350..89d1d9d 100644 --- a/chrome/browser/extensions/api/metrics_private/metrics_private_api.cc +++ b/chrome/browser/extensions/api/metrics_private/metrics_private_api.cc @@ -11,10 +11,10 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/common/extensions/api/metrics_private.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "components/variations/variations_associated_data.h" #include "content/public/browser/user_metrics.h" +#include "extensions/common/extension.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/settings/cros_settings.h" diff --git a/chrome/browser/extensions/api/notifications/notifications_api.cc b/chrome/browser/extensions/api/notifications/notifications_api.cc index 0d4f643..64af8b0 100644 --- a/chrome/browser/extensions/api/notifications/notifications_api.cc +++ b/chrome/browser/extensions/api/notifications/notifications_api.cc @@ -19,9 +19,9 @@ #include "chrome/browser/notifications/notification.h" #include "chrome/browser/notifications/notification_ui_manager.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" +#include "extensions/common/extension.h" #include "extensions/common/features/feature.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc index e19b377..3e97382 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc +++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc @@ -22,9 +22,9 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/common/extensions/api/omnibox.h" #include "chrome/common/extensions/api/omnibox/omnibox_handler.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" +#include "extensions/common/extension.h" #include "ui/gfx/image/image.h" namespace extensions { diff --git a/chrome/browser/extensions/api/permissions/permissions_api.cc b/chrome/browser/extensions/api/permissions/permissions_api.cc index e5ac3aa..3d50593 100644 --- a/chrome/browser/extensions/api/permissions/permissions_api.cc +++ b/chrome/browser/extensions/api/permissions/permissions_api.cc @@ -11,10 +11,10 @@ #include "chrome/browser/extensions/permissions_updater.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/permissions.h" -#include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/permissions/permission_message_provider.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/permissions/permissions_info.h" #include "extensions/common/url_pattern_set.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc index 2b90287..2991d79 100644 --- a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc +++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc @@ -8,9 +8,9 @@ #include "base/json/json_writer.h" #include "base/values.h" #include "chrome/common/extensions/api/permissions.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/permissions/usb_device_permission.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_info.h" #include "extensions/common/url_pattern_set.h" diff --git a/chrome/browser/extensions/api/power/power_api_manager.cc b/chrome/browser/extensions/api/power/power_api_manager.cc index 849989e3..89c5970 100644 --- a/chrome/browser/extensions/api/power/power_api_manager.cc +++ b/chrome/browser/extensions/api/power/power_api_manager.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_service.h" +#include "extensions/common/extension.h" namespace extensions { diff --git a/chrome/browser/extensions/api/power/power_api_unittest.cc b/chrome/browser/extensions/api/power/power_api_unittest.cc index 2014b48..37767a1 100644 --- a/chrome/browser/extensions/api/power/power_api_unittest.cc +++ b/chrome/browser/extensions/api/power/power_api_unittest.cc @@ -14,11 +14,11 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/power/power_api_manager.h" #include "chrome/browser/extensions/extension_function_test_utils.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/power_save_blocker.h" +#include "extensions/common/extension.h" namespace utils = extension_function_test_utils; diff --git a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc index 0fece84..4f26606 100644 --- a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc +++ b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc @@ -11,9 +11,9 @@ #include "chrome/browser/extensions/api/preference/preference_api.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_prefs_unittest.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/testing_profile.h" #include "components/user_prefs/pref_registry_syncable.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" using base::Value; diff --git a/chrome/browser/extensions/api/proxy/proxy_apitest.cc b/chrome/browser/extensions/api/proxy/proxy_apitest.cc index a05e71a..404444d 100644 --- a/chrome/browser/extensions/api/proxy/proxy_apitest.cc +++ b/chrome/browser/extensions/api/proxy/proxy_apitest.cc @@ -8,8 +8,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" +#include "extensions/common/extension.h" namespace extensions { diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc index 0a141a5..c77f667 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc @@ -26,11 +26,11 @@ #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" #include "chrome/common/extensions/api/push_messaging.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" #include "extensions/common/permissions/api_permission.h" #include "google_apis/gaia/gaia_constants.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc index fe20842..b8b81e0 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.cc @@ -11,7 +11,7 @@ #include "base/strings/string_split.h" #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler_delegate.h" #include "chrome/browser/invalidation/invalidation_service.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "google/cacheinvalidation/types.pb.h" #include "sync/notifier/object_id_invalidation_map.h" diff --git a/chrome/browser/extensions/api/runtime/runtime_api.cc b/chrome/browser/extensions/api/runtime/runtime_api.cc index 682c1f4..931bd9f 100644 --- a/chrome/browser/extensions/api/runtime/runtime_api.cc +++ b/chrome/browser/extensions/api/runtime/runtime_api.cc @@ -22,7 +22,6 @@ #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/extensions/api/runtime.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/omaha_query_params/omaha_query_params.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/notification_service.h" @@ -31,6 +30,7 @@ #include "extensions/browser/lazy_background_task_queue.h" #include "extensions/browser/process_manager.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/background_info.h" #include "url/gurl.h" #include "webkit/browser/fileapi/isolated_context.h" diff --git a/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.cc b/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.cc index c82dcbf..e0b564d 100644 --- a/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.cc +++ b/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.cc @@ -12,7 +12,7 @@ #include "chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/glue/device_info.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" using base::DictionaryValue; using base::Value; diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc index 580100d..c836783 100644 --- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc +++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc @@ -17,9 +17,9 @@ #include "chrome/browser/sync/glue/device_info.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/sync/profile_sync_service_mock.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/browser_with_test_window_test.h" +#include "extensions/common/extension.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc index 9275817..9d5e450 100644 --- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc +++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc @@ -22,12 +22,12 @@ #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/common/extensions/api/signed_in_devices.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" using browser_sync::DeviceInfo; namespace extensions { diff --git a/chrome/browser/extensions/api/socket/socket_api.cc b/chrome/browser/extensions/api/socket/socket_api.cc index 77d18ef..da173c2 100644 --- a/chrome/browser/extensions/api/socket/socket_api.cc +++ b/chrome/browser/extensions/api/socket/socket_api.cc @@ -15,9 +15,9 @@ #include "chrome/browser/extensions/api/socket/udp_socket.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/io_thread.h" -#include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/extensions/permissions/socket_permission.h" +#include "extensions/common/extension.h" +#include "extensions/common/permissions/permissions_data.h" #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" diff --git a/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api.cc b/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api.cc index e914a5a..23dc3aa 100644 --- a/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api.cc +++ b/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api.cc @@ -7,9 +7,9 @@ #include "chrome/browser/extensions/api/socket/tcp_socket.h" #include "chrome/browser/extensions/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.h" #include "chrome/common/extensions/api/sockets/sockets_manifest_data.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/extensions/permissions/socket_permission.h" #include "content/public/common/socket_permission_request.h" +#include "extensions/common/permissions/permissions_data.h" #include "net/base/net_errors.h" using content::SocketPermissionRequest; diff --git a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc index a4619dbe..9468fa5 100644 --- a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc +++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc @@ -26,7 +26,6 @@ #include "chrome/browser/value_store/value_store_change.h" #include "chrome/common/extensions/api/storage.h" #include "chrome/common/extensions/api/storage/storage_schema_manifest_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "components/policy/core/common/policy_namespace.h" #include "components/policy/core/common/schema.h" @@ -36,6 +35,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/api_permission.h" diff --git a/chrome/browser/extensions/api/storage/settings_test_util.cc b/chrome/browser/extensions/api/storage/settings_test_util.cc index 82c1845..262a3e1 100644 --- a/chrome/browser/extensions/api/storage/settings_test_util.cc +++ b/chrome/browser/extensions/api/storage/settings_test_util.cc @@ -7,8 +7,8 @@ #include "base/files/file_path.h" #include "chrome/browser/extensions/api/storage/settings_frontend.h" #include "chrome/browser/extensions/extension_system_factory.h" -#include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/permissions_data.h" +#include "extensions/common/extension.h" +#include "extensions/common/permissions/permissions_data.h" namespace extensions { diff --git a/chrome/browser/extensions/api/storage/settings_test_util.h b/chrome/browser/extensions/api/storage/settings_test_util.h index 73b660a..e801dd1 100644 --- a/chrome/browser/extensions/api/storage/settings_test_util.h +++ b/chrome/browser/extensions/api/storage/settings_test_util.h @@ -18,8 +18,8 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/test_extension_service.h" #include "chrome/browser/extensions/test_extension_system.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/testing_profile.h" +#include "extensions/common/extension.h" class ValueStore; diff --git a/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc b/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc index dd34537..f26bc2e 100644 --- a/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc +++ b/chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.cc @@ -13,9 +13,9 @@ #include "chrome/browser/extensions/api/storage/settings_storage_quota_enforcer.h" #include "chrome/browser/extensions/api/storage/weak_unlimited_settings_storage.h" #include "chrome/browser/sync/glue/sync_start_util.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/permissions/api_permission.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/api/streams_private/streams_private_api.h b/chrome/browser/extensions/api/streams_private/streams_private_api.h index ffa3abf..ec78445 100644 --- a/chrome/browser/extensions/api/streams_private/streams_private_api.h +++ b/chrome/browser/extensions/api/streams_private/streams_private_api.h @@ -11,11 +11,11 @@ #include "base/values.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" -#include "chrome/common/extensions/extension.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "extensions/browser/extension_function.h" +#include "extensions/common/extension.h" class Profile; diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc b/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc index b8bdaf2..a27314d 100644 --- a/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc +++ b/chrome/browser/extensions/api/system_indicator/system_indicator_apitest.cc @@ -10,8 +10,8 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/lazy_background_page_test_util.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/extensions/extension.h" #include "extensions/browser/process_manager.h" +#include "extensions/common/extension.h" #include "extensions/common/switches.h" class SystemIndicatorApiTest : public ExtensionApiTest { diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc index a8b344d..b68bcc4 100644 --- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc +++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc @@ -16,9 +16,9 @@ #include "chrome/browser/status_icons/status_icon_observer.h" #include "chrome/browser/status_icons/status_tray.h" #include "chrome/common/extensions/api/system_indicator.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" #include "ui/gfx/image/image.h" namespace extensions { diff --git a/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc b/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc index 8e67fe6..fe431cd 100644 --- a/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc +++ b/chrome/browser/extensions/api/system_storage/system_storage_eject_apitest.cc @@ -15,10 +15,10 @@ #include "chrome/browser/storage_monitor/storage_info.h" #include "chrome/browser/storage_monitor/storage_monitor.h" #include "chrome/browser/storage_monitor/test_storage_monitor.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/render_view_host.h" #include "content/public/test/test_utils.h" #include "extensions/browser/process_manager.h" +#include "extensions/common/extension.h" namespace { diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc index b65ebc4..8f9cd6e 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc @@ -23,11 +23,11 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/features/simple_feature.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "extensions/common/features/feature.h" #include "extensions/common/features/feature_provider.h" +#include "extensions/common/permissions/permissions_data.h" using extensions::api::tab_capture::MediaStreamConstraint; diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc index 8d6e80e..a819b37 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc @@ -10,7 +10,6 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" -#include "chrome/common/extensions/extension.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" @@ -19,6 +18,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" +#include "extensions/common/extension.h" using content::BrowserThread; using extensions::TabCaptureRegistry; diff --git a/chrome/browser/extensions/api/tabs/ash_panel_contents.cc b/chrome/browser/extensions/api/tabs/ash_panel_contents.cc index 44e441c..408f29f 100644 --- a/chrome/browser/extensions/api/tabs/ash_panel_contents.cc +++ b/chrome/browser/extensions/api/tabs/ash_panel_contents.cc @@ -14,10 +14,10 @@ #include "chrome/browser/extensions/window_controller_list.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_tab_helper.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "ui/gfx/image/image.h" using apps::ShellWindow; diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc index 94a04c5..1d80bb4 100644 --- a/chrome/browser/extensions/api/tabs/tabs_api.cc +++ b/chrome/browser/extensions/api/tabs/tabs_api.cc @@ -54,13 +54,11 @@ #include "chrome/common/extensions/api/i18n/default_locale_handler.h" #include "chrome/common/extensions/api/tabs.h" #include "chrome/common/extensions/api/windows.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/message_bundle.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/pref_names.h" #include "chrome/common/translate/language_detection_details.h" #include "chrome/common/url_constants.h" @@ -78,8 +76,10 @@ #include "extensions/browser/file_reader.h" #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/manifest_handlers/incognito_info.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/user_script.h" #include "skia/ext/image_operations.h" #include "skia/ext/platform_canvas.h" diff --git a/chrome/browser/extensions/api/terminal/terminal_extension_helper.cc b/chrome/browser/extensions/api/terminal/terminal_extension_helper.cc index 6c213c2..a067edb 100644 --- a/chrome/browser/extensions/api/terminal/terminal_extension_helper.cc +++ b/chrome/browser/extensions/api/terminal/terminal_extension_helper.cc @@ -6,7 +6,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" namespace { diff --git a/chrome/browser/extensions/api/usb/usb_api.cc b/chrome/browser/extensions/api/usb/usb_api.cc index 206c019..21b8156 100644 --- a/chrome/browser/extensions/api/usb/usb_api.cc +++ b/chrome/browser/extensions/api/usb/usb_api.cc @@ -15,8 +15,8 @@ #include "chrome/browser/usb/usb_device_handle.h" #include "chrome/browser/usb/usb_service.h" #include "chrome/common/extensions/api/usb.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/extensions/permissions/usb_device_permission.h" +#include "extensions/common/permissions/permissions_data.h" namespace usb = extensions::api::usb; namespace BulkTransfer = usb::BulkTransfer; diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc index 477592b..900aee9 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api.cc @@ -40,10 +40,8 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/renderer_host/chrome_render_message_filter.h" #include "chrome/common/extensions/api/web_request.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_message_filter.h" #include "content/public/browser/browser_thread.h" @@ -53,7 +51,9 @@ #include "extensions/browser/info_map.h" #include "extensions/common/error_utils.h" #include "extensions/common/event_filtering_info.h" +#include "extensions/common/extension.h" #include "extensions/common/features/feature.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/url_pattern.h" #include "grit/generated_resources.h" #include "net/base/auth.h" diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions.cc b/chrome/browser/extensions/api/web_request/web_request_permissions.cc index 93430fb..2f3e798 100644 --- a/chrome/browser/extensions/api/web_request/web_request_permissions.cc +++ b/chrome/browser/extensions/api/web_request/web_request_permissions.cc @@ -7,13 +7,13 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/extension_renderer_state.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/url_constants.h" #include "content/public/browser/resource_request_info.h" #include "extensions/browser/info_map.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" +#include "extensions/common/permissions/permissions_data.h" #include "net/url_request/url_request.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc index 5aa9fa1..845f72ba 100644 --- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc +++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc @@ -19,13 +19,13 @@ #include "chrome/browser/media/webrtc_log_uploader.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/media_device_id.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "extensions/common/permissions/permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "media/audio/audio_manager.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc index 3c664aa..6ac1571 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc @@ -30,7 +30,6 @@ #include "chrome/browser/ui/app_list/app_list_service.h" #include "chrome/browser/ui/app_list/app_list_util.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/pref_names.h" @@ -39,6 +38,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc index 30df4ce..aa14346 100644 --- a/chrome/browser/extensions/app_background_page_apitest.cc +++ b/chrome/browser/extensions/app_background_page_apitest.cc @@ -16,10 +16,10 @@ #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_notification_tracker.h" #include "content/public/test/test_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/switches.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/chrome/browser/extensions/app_icon_loader_impl.cc b/chrome/browser/extensions/app_icon_loader_impl.cc index 1172b2b..879033d 100644 --- a/chrome/browser/extensions/app_icon_loader_impl.cc +++ b/chrome/browser/extensions/app_icon_loader_impl.cc @@ -8,9 +8,9 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" +#include "extensions/common/extension.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/image/image_skia_operations.h" diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index ee724eb..6f12316 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -17,7 +17,6 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/test/base/test_switches.h" #include "chrome/test/base/ui_test_utils.h" @@ -29,6 +28,7 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" #include "extensions/browser/process_map.h" +#include "extensions/common/extension.h" #include "extensions/common/switches.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/chrome/browser/extensions/app_sync_bundle.cc b/chrome/browser/extensions/app_sync_bundle.cc index 69ec44b..d14665e 100644 --- a/chrome/browser/extensions/app_sync_bundle.cc +++ b/chrome/browser/extensions/app_sync_bundle.cc @@ -7,9 +7,9 @@ #include "base/location.h" #include "chrome/browser/extensions/extension_sorting.h" #include "chrome/browser/extensions/extension_sync_service.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/sync_helper.h" +#include "extensions/common/extension.h" #include "sync/api/sync_change_processor.h" #include "sync/api/sync_error_factory.h" diff --git a/chrome/browser/extensions/app_sync_data.cc b/chrome/browser/extensions/app_sync_data.cc index cb462ed..f3a817d 100644 --- a/chrome/browser/extensions/app_sync_data.cc +++ b/chrome/browser/extensions/app_sync_data.cc @@ -4,7 +4,7 @@ #include "chrome/browser/extensions/app_sync_data.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "sync/api/sync_data.h" #include "sync/protocol/app_specifics.pb.h" #include "sync/protocol/sync.pb.h" diff --git a/chrome/browser/extensions/browser_extension_window_controller.cc b/chrome/browser/extensions/browser_extension_window_controller.cc index 8bc66bf..0c11941 100644 --- a/chrome/browser/extensions/browser_extension_window_controller.cc +++ b/chrome/browser/extensions/browser_extension_window_controller.cc @@ -12,7 +12,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" BrowserExtensionWindowController::BrowserExtensionWindowController( Browser* browser) diff --git a/chrome/browser/extensions/browser_permissions_policy_delegate.h b/chrome/browser/extensions/browser_permissions_policy_delegate.h index 72f59fd..1ef1e42 100644 --- a/chrome/browser/extensions/browser_permissions_policy_delegate.h +++ b/chrome/browser/extensions/browser_permissions_policy_delegate.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_BROWSER_PERMISSIONS_POLICY_DELEGATE_H_ #define CHROME_BROWSER_EXTENSIONS_BROWSER_PERMISSIONS_POLICY_DELEGATE_H_ -#include "chrome/common/extensions/permissions/permissions_data.h" +#include "extensions/common/permissions/permissions_data.h" namespace extensions { diff --git a/chrome/browser/extensions/browser_permissions_policy_delegate_unittest.cc b/chrome/browser/extensions/browser_permissions_policy_delegate_unittest.cc index 6174b6e..401ac5c 100644 --- a/chrome/browser/extensions/browser_permissions_policy_delegate_unittest.cc +++ b/chrome/browser/extensions/browser_permissions_policy_delegate_unittest.cc @@ -4,14 +4,14 @@ #include "chrome/browser/signin/signin_manager.h" #include "chrome/browser/signin/signin_manager_factory.h" -#include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" #include "content/public/test/mock_render_process_host.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" +#include "extensions/common/permissions/permissions_data.h" #include "testing/gtest/include/gtest/gtest.h" namespace extensions { diff --git a/chrome/browser/extensions/bundle_installer.cc b/chrome/browser/extensions/bundle_installer.cc index 3bd45c0..4f5f7e3 100644 --- a/chrome/browser/extensions/bundle_installer.cc +++ b/chrome/browser/extensions/bundle_installer.cc @@ -19,11 +19,11 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "extensions/common/permissions/permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/bundle_installer.h b/chrome/browser/extensions/bundle_installer.h index 5526bc7..492490c 100644 --- a/chrome/browser/extensions/bundle_installer.h +++ b/chrome/browser/extensions/bundle_installer.h @@ -16,7 +16,7 @@ #include "chrome/browser/extensions/webstore_installer.h" #include "chrome/browser/ui/browser_list_observer.h" #include "chrome/browser/ui/host_desktop.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" namespace base { class DictionaryValue; diff --git a/chrome/browser/extensions/chrome_app_api_browsertest.cc b/chrome/browser/extensions/chrome_app_api_browsertest.cc index 1c5e417..da09d33 100644 --- a/chrome/browser/extensions/chrome_app_api_browsertest.cc +++ b/chrome/browser/extensions/chrome_app_api_browsertest.cc @@ -15,10 +15,10 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "net/dns/mock_host_resolver.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc index 6a4694c..17f9278 100644 --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc @@ -19,11 +19,11 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" #include "extensions/common/id_util.h" #include "extensions/common/manifest_constants.h" #include "grit/browser_resources.h" diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc index d443ebf..64f67d8 100644 --- a/chrome/browser/extensions/component_loader_unittest.cc +++ b/chrome/browser/extensions/component_loader_unittest.cc @@ -11,12 +11,12 @@ #include "base/prefs/pref_registry_simple.h" #include "chrome/browser/extensions/test_extension_service.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service_syncable.h" #include "components/user_prefs/pref_registry_syncable.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/background_info.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc index 55d7531..3f788dd 100644 --- a/chrome/browser/extensions/content_script_apitest.cc +++ b/chrome/browser/extensions/content_script_apitest.cc @@ -10,10 +10,10 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/common/extension.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc index b314969..ef29c3b 100644 --- a/chrome/browser/extensions/convert_user_script.cc +++ b/chrome/browser/extensions/convert_user_script.cc @@ -17,10 +17,10 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/user_script_master.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" #include "crypto/sha2.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/user_script.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/convert_user_script_unittest.cc b/chrome/browser/extensions/convert_user_script_unittest.cc index e1d4be1..d0e5e95 100644 --- a/chrome/browser/extensions/convert_user_script_unittest.cc +++ b/chrome/browser/extensions/convert_user_script_unittest.cc @@ -13,9 +13,9 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/convert_user_script.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" namespace extensions { diff --git a/chrome/browser/extensions/convert_web_app.cc b/chrome/browser/extensions/convert_web_app.cc index 85326e3..155181d 100644 --- a/chrome/browser/extensions/convert_web_app.cc +++ b/chrome/browser/extensions/convert_web_app.cc @@ -21,11 +21,11 @@ #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/web_application_info.h" #include "crypto/sha2.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/codec/png_codec.h" diff --git a/chrome/browser/extensions/convert_web_app_browsertest.cc b/chrome/browser/extensions/convert_web_app_browsertest.cc index 7a70af6..d834187 100644 --- a/chrome/browser/extensions/convert_web_app_browsertest.cc +++ b/chrome/browser/extensions/convert_web_app_browsertest.cc @@ -11,7 +11,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" @@ -24,6 +23,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/permissions/permission_set.h" namespace extensions { diff --git a/chrome/browser/extensions/convert_web_app_unittest.cc b/chrome/browser/extensions/convert_web_app_unittest.cc index 936ed45..f2e550d 100644 --- a/chrome/browser/extensions/convert_web_app_unittest.cc +++ b/chrome/browser/extensions/convert_web_app_unittest.cc @@ -16,11 +16,11 @@ #include "base/time/time.h" #include "base/version.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/web_application_info.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/url_pattern.h" diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index cbf1715..c79a687 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -40,7 +40,6 @@ #include "chrome/common/extensions/manifest_handlers/kiosk_mode_info.h" #include "chrome/common/extensions/manifest_handlers/shared_module_info.h" #include "chrome/common/extensions/manifest_url_handler.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/resource_dispatcher_host.h" @@ -49,6 +48,7 @@ #include "extensions/common/manifest.h" #include "extensions/common/permissions/permission_message_provider.h" #include "extensions/common/permissions/permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/user_script.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/crx_installer.h b/chrome/browser/extensions/crx_installer.h index 6d55481..b213a3f 100644 --- a/chrome/browser/extensions/crx_installer.h +++ b/chrome/browser/extensions/crx_installer.h @@ -17,7 +17,7 @@ #include "chrome/browser/extensions/extension_installer.h" #include "chrome/browser/extensions/sandboxed_unpacker.h" #include "chrome/browser/extensions/webstore_installer.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "sync/api/string_ordinal.h" diff --git a/chrome/browser/extensions/crx_installer_browsertest.cc b/chrome/browser/extensions/crx_installer_browsertest.cc index 29f645a..3e5bd6f 100644 --- a/chrome/browser/extensions/crx_installer_browsertest.cc +++ b/chrome/browser/extensions/crx_installer_browsertest.cc @@ -15,12 +15,12 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/render_view_host.h" #include "content/public/test/download_test_observer.h" +#include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/switches.h" diff --git a/chrome/browser/extensions/data_deleter.cc b/chrome/browser/extensions/data_deleter.cc index 8d53a42..c0947f8 100644 --- a/chrome/browser/extensions/data_deleter.cc +++ b/chrome/browser/extensions/data_deleter.cc @@ -7,11 +7,11 @@ #include "chrome/browser/extensions/api/storage/settings_frontend.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/storage_partition.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "net/url_request/url_request_context_getter.h" using content::BrowserContext; diff --git a/chrome/browser/extensions/default_apps.cc b/chrome/browser/extensions/default_apps.cc index 73fc05d7..4d01de3 100644 --- a/chrome/browser/extensions/default_apps.cc +++ b/chrome/browser/extensions/default_apps.cc @@ -8,15 +8,15 @@ #include <string> #include "base/command_line.h" -#include "chrome/browser/browser_process.h" -#include "components/user_prefs/pref_registry_syncable.h" #include "base/prefs/pref_service.h" +#include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" +#include "components/user_prefs/pref_registry_syncable.h" +#include "extensions/common/extension.h" #include "ui/base/l10n/l10n_util.h" #if !defined(OS_ANDROID) diff --git a/chrome/browser/extensions/default_apps_unittest.cc b/chrome/browser/extensions/default_apps_unittest.cc index 1f16f2d..1032d37 100644 --- a/chrome/browser/extensions/default_apps_unittest.cc +++ b/chrome/browser/extensions/default_apps_unittest.cc @@ -8,10 +8,10 @@ #include "chrome/browser/extensions/default_apps.h" #include "chrome/browser/extensions/external_pref_loader.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" using default_apps::Provider; diff --git a/chrome/browser/extensions/devtools_util.cc b/chrome/browser/extensions/devtools_util.cc index 5b35dfd..21e5fe8 100644 --- a/chrome/browser/extensions/devtools_util.cc +++ b/chrome/browser/extensions/devtools_util.cc @@ -8,9 +8,9 @@ #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "extensions/browser/lazy_background_task_queue.h" #include "extensions/browser/process_manager.h" +#include "extensions/common/extension.h" namespace extensions { namespace devtools_util { diff --git a/chrome/browser/extensions/error_console/error_console.cc b/chrome/browser/extensions/error_console/error_console.cc index 47352f9..9f4c7be 100644 --- a/chrome/browser/extensions/error_console/error_console.cc +++ b/chrome/browser/extensions/error_console/error_console.cc @@ -17,13 +17,13 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" namespace extensions { diff --git a/chrome/browser/extensions/error_console/error_console_browsertest.cc b/chrome/browser/extensions/error_console/error_console_browsertest.cc index 34514e9..ed6f3b4 100644 --- a/chrome/browser/extensions/error_console/error_console_browsertest.cc +++ b/chrome/browser/extensions/error_console/error_console_browsertest.cc @@ -12,12 +12,12 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_toolbar_model.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/ui_test_utils.h" #include "extensions/browser/extension_error.h" #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_urls.h" #include "extensions/common/feature_switch.h" #include "extensions/common/manifest_constants.h" diff --git a/chrome/browser/extensions/event_router.cc b/chrome/browser/extensions/event_router.cc index fdf4c3f..f0eba31 100644 --- a/chrome/browser/extensions/event_router.cc +++ b/chrome/browser/extensions/event_router.cc @@ -21,7 +21,6 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" @@ -29,6 +28,7 @@ #include "extensions/browser/lazy_background_task_queue.h" #include "extensions/browser/process_manager.h" #include "extensions/browser/process_map.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_api.h" #include "extensions/common/extension_urls.h" #include "extensions/common/manifest_handlers/background_info.h" diff --git a/chrome/browser/extensions/extension_action_icon_factory.cc b/chrome/browser/extensions/extension_action_icon_factory.cc index cbffbbc..0e40e65 100644 --- a/chrome/browser/extensions/extension_action_icon_factory.cc +++ b/chrome/browser/extensions/extension_action_icon_factory.cc @@ -6,8 +6,8 @@ #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" +#include "extensions/common/extension.h" #include "grit/theme_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc index 649ac62..e8816bb 100644 --- a/chrome/browser/extensions/extension_action_icon_factory_unittest.cc +++ b/chrome/browser/extensions/extension_action_icon_factory_unittest.cc @@ -14,9 +14,9 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/common/extension.h" #include "grit/theme_resources.h" #include "skia/ext/image_operations.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/extension_action_manager.cc b/chrome/browser/extensions/extension_action_manager.cc index d3e036e..d010b9f 100644 --- a/chrome/browser/extensions/extension_action_manager.cc +++ b/chrome/browser/extensions/extension_action_manager.cc @@ -15,11 +15,11 @@ #include "chrome/common/extensions/api/extension_action/action_info.h" #include "chrome/common/extensions/api/extension_action/page_action_handler.h" #include "chrome/common/extensions/api/extension_action/script_badge_handler.h" -#include "chrome/common/extensions/extension.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" namespace extensions { diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc index 0df5462..47cf2df 100644 --- a/chrome/browser/extensions/extension_apitest.cc +++ b/chrome/browser/extensions/extension_apitest.cc @@ -15,15 +15,15 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/extensions/application_launch.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" +#include "extensions/common/extension.h" #include "net/base/escape.h" #include "net/base/net_util.h" #include "net/test/embedded_test_server/embedded_test_server.h" -#include "net/test/embedded_test_server/http_response.h" #include "net/test/embedded_test_server/http_request.h" +#include "net/test/embedded_test_server/http_response.h" #include "net/test/spawned_test_server/spawned_test_server.h" namespace { diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h index 9acc3a3f..f70537c 100644 --- a/chrome/browser/extensions/extension_browsertest.h +++ b/chrome/browser/extensions/extension_browsertest.h @@ -15,10 +15,10 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_test_notification_observer.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" #include "extensions/common/manifest.h" diff --git a/chrome/browser/extensions/extension_commands_global_registry.cc b/chrome/browser/extensions/extension_commands_global_registry.cc index a7ebd89..893924a 100644 --- a/chrome/browser/extensions/extension_commands_global_registry.cc +++ b/chrome/browser/extensions/extension_commands_global_registry.cc @@ -11,7 +11,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/global_shortcut_listener.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" namespace extensions { diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc index 43f8e07..96f568f 100644 --- a/chrome/browser/extensions/extension_context_menu_model.cc +++ b/chrome/browser/extensions/extension_context_menu_model.cc @@ -17,12 +17,12 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/extension_creator.cc b/chrome/browser/extensions/extension_creator.cc index 61d4a4a..be9ac61 100644 --- a/chrome/browser/extensions/extension_creator.cc +++ b/chrome/browser/extensions/extension_creator.cc @@ -14,11 +14,11 @@ #include "base/memory/scoped_handle.h" #include "base/strings/string_util.h" #include "chrome/browser/extensions/extension_creator_filter.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" #include "crypto/rsa_private_key.h" #include "crypto/signature_creator.h" #include "extensions/common/crx_file.h" +#include "extensions/common/extension.h" #include "extensions/common/id_util.h" #include "grit/generated_resources.h" #include "third_party/zlib/google/zip.h" diff --git a/chrome/browser/extensions/extension_disabled_ui.cc b/chrome/browser/extensions/extension_disabled_ui.cc index 6a509cd..4a5c3d9 100644 --- a/chrome/browser/extensions/extension_disabled_ui.cc +++ b/chrome/browser/extensions/extension_disabled_ui.cc @@ -26,13 +26,13 @@ #include "chrome/browser/ui/global_error/global_error_service.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" #include "extensions/common/permissions/permission_message_provider.h" #include "extensions/common/permissions/permission_set.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc index 5dede6a49..5c6e7fc 100644 --- a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc +++ b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc @@ -18,10 +18,10 @@ #include "chrome/browser/ui/global_error/global_error_service.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_utils.h" #include "content/test/net/url_request_prepackaged_interceptor.h" +#include "extensions/common/extension.h" #include "net/url_request/url_fetcher.h" using extensions::Extension; diff --git a/chrome/browser/extensions/extension_error_ui.h b/chrome/browser/extensions/extension_error_ui.h index f0faef2..d70fa1a 100644 --- a/chrome/browser/extensions/extension_error_ui.h +++ b/chrome/browser/extensions/extension_error_ui.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "chrome/browser/ui/global_error/global_error.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" class Browser; class ExtensionService; diff --git a/chrome/browser/extensions/extension_error_ui_default.h b/chrome/browser/extensions/extension_error_ui_default.h index 6861d56..dab1444 100644 --- a/chrome/browser/extensions/extension_error_ui_default.h +++ b/chrome/browser/extensions/extension_error_ui_default.h @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "chrome/browser/extensions/extension_error_ui.h" #include "chrome/browser/ui/global_error/global_error.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" class Browser; class ExtensionService; diff --git a/chrome/browser/extensions/extension_function_test_utils.cc b/chrome/browser/extensions/extension_function_test_utils.cc index cf16bd1..df91ad0 100644 --- a/chrome/browser/extensions/extension_function_test_utils.cc +++ b/chrome/browser/extensions/extension_function_test_utils.cc @@ -13,9 +13,9 @@ #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" #include "extensions/browser/extension_function.h" +#include "extensions/common/extension.h" #include "extensions/common/id_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index 4a356ac..f312a95 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -34,7 +34,6 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/prefs/prefs_tab_helper.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/render_messages.h" @@ -51,6 +50,7 @@ #include "extensions/browser/extension_error.h" #include "extensions/browser/process_manager.h" #include "extensions/browser/view_type_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_urls.h" #include "extensions/common/feature_switch.h" #include "extensions/common/manifest_handlers/background_info.h" diff --git a/chrome/browser/extensions/extension_icon_image.cc b/chrome/browser/extensions/extension_icon_image.cc index 6c0b4b3..625bb01 100644 --- a/chrome/browser/extensions/extension_icon_image.cc +++ b/chrome/browser/extensions/extension_icon_image.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/image_loader.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_service.h" +#include "extensions/common/extension.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/canvas_image_source.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/extensions/extension_icon_image_unittest.cc b/chrome/browser/extensions/extension_icon_image_unittest.cc index fd35ee9..da1e354 100644 --- a/chrome/browser/extensions/extension_icon_image_unittest.cc +++ b/chrome/browser/extensions/extension_icon_image_unittest.cc @@ -9,11 +9,11 @@ #include "base/path_service.h" #include "chrome/browser/extensions/image_loader.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "grit/theme_resources.h" #include "skia/ext/image_operations.h" diff --git a/chrome/browser/extensions/extension_icon_manager.cc b/chrome/browser/extensions/extension_icon_manager.cc index e247da3..422ed8f 100644 --- a/chrome/browser/extensions/extension_icon_manager.cc +++ b/chrome/browser/extensions/extension_icon_manager.cc @@ -8,10 +8,10 @@ #include "base/logging.h" #include "base/stl_util.h" #include "chrome/browser/extensions/image_loader.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "grit/theme_resources.h" #include "skia/ext/image_operations.h" diff --git a/chrome/browser/extensions/extension_icon_manager_unittest.cc b/chrome/browser/extensions/extension_icon_manager_unittest.cc index 287f98b..8fcf7f9 100644 --- a/chrome/browser/extensions/extension_icon_manager_unittest.cc +++ b/chrome/browser/extensions/extension_icon_manager_unittest.cc @@ -8,9 +8,9 @@ #include "base/values.h" #include "chrome/browser/extensions/extension_icon_manager.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/id_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/skia_util.h" diff --git a/chrome/browser/extensions/extension_infobar_delegate.cc b/chrome/browser/extensions/extension_infobar_delegate.cc index 66e3f09..95bb654 100644 --- a/chrome/browser/extensions/extension_infobar_delegate.cc +++ b/chrome/browser/extensions/extension_infobar_delegate.cc @@ -11,9 +11,9 @@ #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" ExtensionInfoBarDelegate::~ExtensionInfoBarDelegate() { if (observer_) diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc index b3c02a4..198df66 100644 --- a/chrome/browser/extensions/extension_install_prompt.cc +++ b/chrome/browser/extensions/extension_install_prompt.cc @@ -23,20 +23,20 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/pref_names.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "extensions/common/feature_switch.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/permission_message_provider.h" #include "extensions/common/permissions/permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/url_pattern.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/extension_installer.h b/chrome/browser/extensions/extension_installer.h index 9e05c6a..13170cb 100644 --- a/chrome/browser/extensions/extension_installer.h +++ b/chrome/browser/extensions/extension_installer.h @@ -12,7 +12,7 @@ #include "base/strings/string16.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/requirements_checker.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" class Profile; diff --git a/chrome/browser/extensions/extension_keybinding_apitest.cc b/chrome/browser/extensions/extension_keybinding_apitest.cc index 7028633..136910f 100644 --- a/chrome/browser/extensions/extension_keybinding_apitest.cc +++ b/chrome/browser/extensions/extension_keybinding_apitest.cc @@ -11,14 +11,14 @@ #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/test/base/interactive_test_utils.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" +#include "extensions/common/permissions/permissions_data.h" using content::WebContents; diff --git a/chrome/browser/extensions/extension_notification_observer.cc b/chrome/browser/extensions/extension_notification_observer.cc index b06c0bb..8447d15 100644 --- a/chrome/browser/extensions/extension_notification_observer.cc +++ b/chrome/browser/extensions/extension_notification_observer.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/strings/stringprintf.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" namespace extensions { diff --git a/chrome/browser/extensions/extension_prefs.h b/chrome/browser/extensions/extension_prefs.h index 081eb66..5646248 100644 --- a/chrome/browser/extensions/extension_prefs.h +++ b/chrome/browser/extensions/extension_prefs.h @@ -15,9 +15,9 @@ #include "base/time/time.h" #include "base/values.h" #include "chrome/browser/extensions/extension_scoped_prefs.h" -#include "chrome/common/extensions/extension.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/url_pattern_set.h" #include "sync/api/string_ordinal.h" diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc index 13824e4..573c98a 100644 --- a/chrome/browser/extensions/extension_protocols.cc +++ b/chrome/browser/extensions/extension_protocols.cc @@ -27,7 +27,6 @@ #include "chrome/browser/extensions/image_loader.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/csp_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/extensions/manifest_handlers/shared_module_info.h" #include "chrome/common/extensions/manifest_url_handler.h" @@ -38,6 +37,7 @@ #include "content/public/browser/resource_request_info.h" #include "extensions/browser/info_map.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "extensions/common/file_util.h" #include "extensions/common/manifest_handlers/background_info.h" diff --git a/chrome/browser/extensions/extension_protocols_unittest.cc b/chrome/browser/extensions/extension_protocols_unittest.cc index 0bfa1d7..9d95461 100644 --- a/chrome/browser/extensions/extension_protocols_unittest.cc +++ b/chrome/browser/extensions/extension_protocols_unittest.cc @@ -11,13 +11,13 @@ #include "base/values.h" #include "chrome/browser/extensions/extension_protocols.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "content/public/browser/resource_request_info.h" #include "content/public/test/mock_resource_context.h" #include "content/public/test/test_browser_thread_bundle.h" #include "extensions/browser/info_map.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "net/base/request_priority.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_job_factory_impl.h" diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index f9dafbd..c636c14 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -69,7 +69,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/crash_keys.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/extension_messages.h" @@ -78,7 +77,6 @@ #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_handlers/shared_module_info.h" #include "chrome/common/extensions/manifest_url_handler.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "components/startup_metric_utils/startup_metric_utils.h" @@ -93,6 +91,7 @@ #include "extensions/browser/process_manager.h" #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/extensions_client.h" #include "extensions/common/feature_switch.h" #include "extensions/common/manifest.h" @@ -100,6 +99,7 @@ #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/manifest_handlers/incognito_info.h" #include "extensions/common/permissions/permission_message_provider.h" +#include "extensions/common/permissions/permissions_data.h" #include "grit/generated_resources.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "ui/base/webui/web_ui_util.h" diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index f68fe25..a4d8258 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -28,7 +28,6 @@ #include "chrome/browser/extensions/pending_enables.h" #include "chrome/browser/extensions/pending_extension_manager.h" #include "chrome/browser/extensions/update_observer.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_handlers/shared_module_info.h" @@ -38,6 +37,7 @@ #include "extensions/browser/process_manager.h" #include "extensions/browser/process_map.h" #include "extensions/browser/quota_service.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/one_shot_event.h" diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 67695c6..d730776 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -73,7 +73,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/api/plugins/plugins_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" @@ -94,6 +93,7 @@ #include "content/public/common/content_constants.h" #include "content/public/test/test_utils.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #include "extensions/common/extension_resource.h" #include "extensions/common/manifest_constants.h" diff --git a/chrome/browser/extensions/extension_sorting.cc b/chrome/browser/extensions/extension_sorting.cc index fc44114..1d5edcb 100644 --- a/chrome/browser/extensions/extension_sorting.cc +++ b/chrome/browser/extensions/extension_sorting.cc @@ -10,9 +10,9 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_scoped_prefs.h" #include "chrome/browser/extensions/extension_sync_service.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "content/public/browser/notification_service.h" +#include "extensions/common/extension.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/extensions/default_app_order.h" diff --git a/chrome/browser/extensions/extension_sorting.h b/chrome/browser/extensions/extension_sorting.h index ea45fa4..5c02d4a 100644 --- a/chrome/browser/extensions/extension_sorting.h +++ b/chrome/browser/extensions/extension_sorting.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "chrome/browser/extensions/extension_prefs.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "sync/api/string_ordinal.h" class ExtensionScopedPrefs; diff --git a/chrome/browser/extensions/extension_special_storage_policy.cc b/chrome/browser/extensions/extension_special_storage_policy.cc index 4d05765..8cf296d 100644 --- a/chrome/browser/extensions/extension_special_storage_policy.cc +++ b/chrome/browser/extensions/extension_special_storage_policy.cc @@ -13,11 +13,11 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_types.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" using content::BrowserThread; using extensions::APIPermission; diff --git a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc index 6b23aa8..71ef27f 100644 --- a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc +++ b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc @@ -8,9 +8,9 @@ #include "chrome/browser/extensions/extension_special_storage_policy.h" #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_types.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/extension_sync_bundle.cc b/chrome/browser/extensions/extension_sync_bundle.cc index a43963d..ab133b5 100644 --- a/chrome/browser/extensions/extension_sync_bundle.cc +++ b/chrome/browser/extensions/extension_sync_bundle.cc @@ -7,9 +7,9 @@ #include "base/location.h" #include "chrome/browser/extensions/extension_sorting.h" #include "chrome/browser/extensions/extension_sync_service.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/sync_helper.h" +#include "extensions/common/extension.h" #include "sync/api/sync_change_processor.h" #include "sync/api/sync_error_factory.h" diff --git a/chrome/browser/extensions/extension_sync_data.cc b/chrome/browser/extensions/extension_sync_data.cc index acef30e..2371867 100644 --- a/chrome/browser/extensions/extension_sync_data.cc +++ b/chrome/browser/extensions/extension_sync_data.cc @@ -7,8 +7,8 @@ #include "base/logging.h" #include "chrome/browser/extensions/app_sync_data.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_url_handler.h" +#include "extensions/common/extension.h" #include "sync/api/sync_data.h" #include "sync/protocol/extension_specifics.pb.h" #include "sync/protocol/sync.pb.h" diff --git a/chrome/browser/extensions/extension_sync_service.cc b/chrome/browser/extensions/extension_sync_service.cc index 2d81eff..670c73d 100644 --- a/chrome/browser/extensions/extension_sync_service.cc +++ b/chrome/browser/extensions/extension_sync_service.cc @@ -20,9 +20,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/glue/sync_start_util.h" #include "chrome/browser/sync/sync_prefs.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/sync_helper.h" #include "content/public/browser/browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" #include "extensions/common/manifest_constants.h" #include "sync/api/sync_change.h" diff --git a/chrome/browser/extensions/extension_sync_service.h b/chrome/browser/extensions/extension_sync_service.h index 65559e9..81c6a5b 100644 --- a/chrome/browser/extensions/extension_sync_service.h +++ b/chrome/browser/extensions/extension_sync_service.h @@ -13,8 +13,8 @@ #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_sync_bundle.h" #include "chrome/browser/extensions/pending_enables.h" -#include "chrome/common/extensions/extension.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "extensions/common/extension.h" #include "sync/api/string_ordinal.h" #include "sync/api/sync_change.h" #include "sync/api/syncable_service.h" diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc index bb18b07..96f4b87 100644 --- a/chrome/browser/extensions/extension_system.cc +++ b/chrome/browser/extensions/extension_system.cc @@ -37,7 +37,6 @@ #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/features/feature_channel.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/url_data_source.h" @@ -45,6 +44,7 @@ #include "extensions/browser/lazy_background_task_queue.h" #include "extensions/browser/process_manager.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #if defined(ENABLE_NOTIFICATIONS) diff --git a/chrome/browser/extensions/extension_system.h b/chrome/browser/extensions/extension_system.h index a96cfeb..fa5e1a6 100644 --- a/chrome/browser/extensions/extension_system.h +++ b/chrome/browser/extensions/extension_system.h @@ -9,8 +9,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "chrome/common/extensions/extension.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "extensions/common/extension.h" #include "extensions/common/one_shot_event.h" class ExtensionService; diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc index 9fd5ec0..fcba218 100644 --- a/chrome/browser/extensions/extension_tab_util.cc +++ b/chrome/browser/extensions/extension_tab_util.cc @@ -19,17 +19,17 @@ #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_url_handler.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/net/url_fixer_upper.h" #include "chrome/common/url_constants.h" #include "content/public/browser/favicon_status.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/api_permission.h" +#include "extensions/common/permissions/permissions_data.h" #include "url/gurl.h" using apps::ShellWindow; diff --git a/chrome/browser/extensions/extension_test_notification_observer.cc b/chrome/browser/extensions/extension_test_notification_observer.cc index c9f22ef..94ad1ff 100644 --- a/chrome/browser/extensions/extension_test_notification_observer.cc +++ b/chrome/browser/extensions/extension_test_notification_observer.cc @@ -10,12 +10,12 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_view_host.h" #include "content/public/test/test_utils.h" #include "extensions/browser/process_manager.h" +#include "extensions/common/extension.h" using extensions::Extension; diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc index 612036b..8cc820c 100644 --- a/chrome/browser/extensions/extension_toolbar_model.cc +++ b/chrome/browser/extensions/extension_toolbar_model.cc @@ -20,11 +20,11 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" using extensions::Extension; diff --git a/chrome/browser/extensions/extension_toolbar_model.h b/chrome/browser/extensions/extension_toolbar_model.h index 7f88f67..d739ce3 100644 --- a/chrome/browser/extensions/extension_toolbar_model.h +++ b/chrome/browser/extensions/extension_toolbar_model.h @@ -8,11 +8,11 @@ #include "base/compiler_specific.h" #include "base/observer_list.h" #include "base/prefs/pref_change_registrar.h" -#include "chrome/common/extensions/extension.h" #include "chrome/browser/extensions/extension_prefs.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "extensions/common/extension.h" class Browser; class ExtensionService; diff --git a/chrome/browser/extensions/extension_ui_unittest.cc b/chrome/browser/extensions/extension_ui_unittest.cc index d856cf1..a7e88b9 100644 --- a/chrome/browser/extensions/extension_ui_unittest.cc +++ b/chrome/browser/extensions/extension_ui_unittest.cc @@ -12,10 +12,10 @@ #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/extensions/extension_uninstall_dialog.cc b/chrome/browser/extensions/extension_uninstall_dialog.cc index 317ddac..3020c04 100644 --- a/chrome/browser/extensions/extension_uninstall_dialog.cc +++ b/chrome/browser/extensions/extension_uninstall_dialog.cc @@ -11,12 +11,12 @@ #include "chrome/browser/extensions/image_loader.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/extensions/extension_util.cc b/chrome/browser/extensions/extension_util.cc index b5a03f6..1192a0d 100644 --- a/chrome/browser/extensions/extension_util.cc +++ b/chrome/browser/extensions/extension_util.cc @@ -9,8 +9,8 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_sync_service.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/sync_helper.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_handlers/incognito_info.h" diff --git a/chrome/browser/extensions/extension_warning_service.cc b/chrome/browser/extensions/extension_warning_service.cc index d59c76e..af2f3b8 100644 --- a/chrome/browser/extensions/extension_warning_service.cc +++ b/chrome/browser/extensions/extension_warning_service.cc @@ -11,10 +11,9 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/common/extensions/extension.h" - #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" +#include "extensions/common/extension.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/extension_warning_set.cc b/chrome/browser/extensions/extension_warning_set.cc index 67e90a3..c61a0de 100644 --- a/chrome/browser/extensions/extension_warning_set.cc +++ b/chrome/browser/extensions/extension_warning_set.cc @@ -7,9 +7,9 @@ #include "base/files/file_path.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "content/public/browser/browser_thread.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/escape.h" diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc index db08d96..34ac503 100644 --- a/chrome/browser/extensions/extension_web_ui.cc +++ b/chrome/browser/extensions/extension_web_ui.cc @@ -20,7 +20,6 @@ #include "chrome/browser/favicon/favicon_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" @@ -31,6 +30,7 @@ #include "content/public/browser/web_ui.h" #include "content/public/common/bindings_policy.h" #include "content/public/common/page_transition_types.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "extensions/common/manifest_handlers/incognito_info.h" #include "net/base/file_stream.h" diff --git a/chrome/browser/extensions/extension_webkit_preferences.cc b/chrome/browser/extensions/extension_webkit_preferences.cc index 09673f3..0455227 100644 --- a/chrome/browser/extensions/extension_webkit_preferences.cc +++ b/chrome/browser/extensions/extension_webkit_preferences.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "webkit/common/webpreferences.h" diff --git a/chrome/browser/extensions/external_install_ui.cc b/chrome/browser/extensions/external_install_ui.cc index 75c6974..b5ac233 100644 --- a/chrome/browser/extensions/external_install_ui.cc +++ b/chrome/browser/extensions/external_install_ui.cc @@ -26,13 +26,13 @@ #include "chrome/browser/ui/global_error/global_error_service.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "chrome/browser/ui/host_desktop.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/extensions/external_policy_loader_unittest.cc b/chrome/browser/extensions/external_policy_loader_unittest.cc index 4fe89ed..067c38d 100644 --- a/chrome/browser/extensions/external_policy_loader_unittest.cc +++ b/chrome/browser/extensions/external_policy_loader_unittest.cc @@ -12,11 +12,11 @@ #include "chrome/browser/extensions/external_policy_loader.h" #include "chrome/browser/extensions/external_provider_impl.h" #include "chrome/browser/extensions/external_provider_interface.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_pref_service_syncable.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/external_provider_impl.cc b/chrome/browser/extensions/external_provider_impl.cc index 67ef13a..9312501 100644 --- a/chrome/browser/extensions/external_provider_impl.cc +++ b/chrome/browser/extensions/external_provider_impl.cc @@ -27,9 +27,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/external_registry_loader_win.cc b/chrome/browser/extensions/external_registry_loader_win.cc index cf446c0..599b0cd 100644 --- a/chrome/browser/extensions/external_registry_loader_win.cc +++ b/chrome/browser/extensions/external_registry_loader_win.cc @@ -16,8 +16,8 @@ #include "base/version.h" #include "base/win/registry.h" #include "chrome/browser/extensions/external_provider_impl.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" +#include "extensions/common/extension.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/image_loader.cc b/chrome/browser/extensions/image_loader.cc index ee2567f..dc6a42a 100644 --- a/chrome/browser/extensions/image_loader.cc +++ b/chrome/browser/extensions/image_loader.cc @@ -16,8 +16,8 @@ #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/extensions/image_loader_factory.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" +#include "extensions/common/extension.h" #include "grit/chrome_unscaled_resources.h" #include "grit/component_extension_resources_map.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/extensions/image_loader_unittest.cc b/chrome/browser/extensions/image_loader_unittest.cc index a8f0d15..9b444b1 100644 --- a/chrome/browser/extensions/image_loader_unittest.cc +++ b/chrome/browser/extensions/image_loader_unittest.cc @@ -9,12 +9,12 @@ #include "base/path_service.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "extensions/common/manifest.h" #include "grit/component_extension_resources.h" diff --git a/chrome/browser/extensions/install_signer.h b/chrome/browser/extensions/install_signer.h index b110bef..6fd8953 100644 --- a/chrome/browser/extensions/install_signer.h +++ b/chrome/browser/extensions/install_signer.h @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/memory/scoped_ptr.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" namespace base { class DictionaryValue; diff --git a/chrome/browser/extensions/install_verifier.h b/chrome/browser/extensions/install_verifier.h index eb5d17c..1c45530 100644 --- a/chrome/browser/extensions/install_verifier.h +++ b/chrome/browser/extensions/install_verifier.h @@ -14,7 +14,7 @@ #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/management_policy.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" namespace net { class URLRequestContextGetter; diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc index 6700cba6..b037c0d 100644 --- a/chrome/browser/extensions/installed_loader.cc +++ b/chrome/browser/extensions/installed_loader.cc @@ -20,13 +20,13 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/manifest_handlers/background_info.h" diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc index 296f3aa..e087319 100644 --- a/chrome/browser/extensions/lazy_background_page_apitest.cc +++ b/chrome/browser/extensions/lazy_background_page_apitest.cc @@ -22,12 +22,12 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/switches.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/chrome/browser/extensions/management_policy.h b/chrome/browser/extensions/management_policy.h index 5a1de2c..1aafc41 100644 --- a/chrome/browser/extensions/management_policy.h +++ b/chrome/browser/extensions/management_policy.h @@ -9,7 +9,7 @@ #include <string> #include "base/basictypes.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" namespace extensions { diff --git a/chrome/browser/extensions/menu_manager.cc b/chrome/browser/extensions/menu_manager.cc index f0bb54f..ac88df8 100644 --- a/chrome/browser/extensions/menu_manager.cc +++ b/chrome/browser/extensions/menu_manager.cc @@ -23,12 +23,12 @@ #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/context_menus.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" #include "content/public/common/context_menu_params.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/background_info.h" #include "ui/gfx/favicon_size.h" #include "ui/gfx/text_elider.h" diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc index d9df606..aaeb46e 100644 --- a/chrome/browser/extensions/menu_manager_unittest.cc +++ b/chrome/browser/extensions/menu_manager_unittest.cc @@ -23,11 +23,11 @@ #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/api/context_menus.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_service.h" #include "content/public/common/context_menu_params.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/common/extension.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/notifications_apitest.cc b/chrome/browser/extensions/notifications_apitest.cc index b86ffd0..6b0a2ba 100644 --- a/chrome/browser/extensions/notifications_apitest.cc +++ b/chrome/browser/extensions/notifications_apitest.cc @@ -9,8 +9,8 @@ #include "chrome/browser/notifications/desktop_notification_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/extensions/extension.h" #include "extensions/browser/process_manager.h" +#include "extensions/common/extension.h" #include "extensions/common/switches.h" #include "ui/message_center/message_center_switches.h" #include "ui/message_center/message_center_util.h" diff --git a/chrome/browser/extensions/options_page_apitest.cc b/chrome/browser/extensions/options_page_apitest.cc index 8e9cf54..be010f9 100644 --- a/chrome/browser/extensions/options_page_apitest.cc +++ b/chrome/browser/extensions/options_page_apitest.cc @@ -7,11 +7,11 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/common/extension.h" using extensions::Extension; diff --git a/chrome/browser/extensions/page_action_browsertest.cc b/chrome/browser/extensions/page_action_browsertest.cc index 921b333..39b58bc 100644 --- a/chrome/browser/extensions/page_action_browsertest.cc +++ b/chrome/browser/extensions/page_action_browsertest.cc @@ -11,8 +11,8 @@ #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/switches.h" namespace extensions { diff --git a/chrome/browser/extensions/page_action_controller_unittest.cc b/chrome/browser/extensions/page_action_controller_unittest.cc index 7b8cddc..d715e5c 100644 --- a/chrome/browser/extensions/page_action_controller_unittest.cc +++ b/chrome/browser/extensions/page_action_controller_unittest.cc @@ -14,11 +14,11 @@ #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/browser/sessions/session_id.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #include "extensions/common/value_builder.h" diff --git a/chrome/browser/extensions/pending_extension_info.h b/chrome/browser/extensions/pending_extension_info.h index b1ee8fe..0ce46a8 100644 --- a/chrome/browser/extensions/pending_extension_info.h +++ b/chrome/browser/extensions/pending_extension_info.h @@ -8,7 +8,7 @@ #include <string> #include "base/version.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/pending_extension_manager.h b/chrome/browser/extensions/pending_extension_manager.h index 44a99c9..cc98f55 100644 --- a/chrome/browser/extensions/pending_extension_manager.h +++ b/chrome/browser/extensions/pending_extension_manager.h @@ -9,7 +9,7 @@ #include <string> #include "chrome/browser/extensions/pending_extension_info.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" class ExtensionServiceInterface; diff --git a/chrome/browser/extensions/permissions_updater.cc b/chrome/browser/extensions/permissions_updater.cc index 1e38cb8..6fdd758 100644 --- a/chrome/browser/extensions/permissions_updater.cc +++ b/chrome/browser/extensions/permissions_updater.cc @@ -14,13 +14,13 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/permissions.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" +#include "extensions/common/extension.h" +#include "extensions/common/permissions/permissions_data.h" using content::RenderProcessHost; using extensions::permissions_api_helpers::PackPermissionSet; diff --git a/chrome/browser/extensions/permissions_updater_unittest.cc b/chrome/browser/extensions/permissions_updater_unittest.cc index 7a0e431..78b9a89 100644 --- a/chrome/browser/extensions/permissions_updater_unittest.cc +++ b/chrome/browser/extensions/permissions_updater_unittest.cc @@ -13,12 +13,12 @@ #include "chrome/browser/extensions/extension_service_unittest.h" #include "chrome/browser/extensions/permissions_updater.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_test_util.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" +#include "extensions/common/extension.h" #include "extensions/common/permissions/permission_set.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc index c74a58e..0d86429 100644 --- a/chrome/browser/extensions/plugin_apitest.cc +++ b/chrome/browser/extensions/plugin_apitest.cc @@ -12,7 +12,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/test_switches.h" #include "chrome/test/base/ui_test_utils.h" @@ -20,6 +19,7 @@ #include "content/public/browser/plugin_service.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/common/extension.h" #include "net/base/net_util.h" using content::NavigationController; diff --git a/chrome/browser/extensions/plugin_manager.cc b/chrome/browser/extensions/plugin_manager.cc index ff77620..98a67b6 100644 --- a/chrome/browser/extensions/plugin_manager.cc +++ b/chrome/browser/extensions/plugin_manager.cc @@ -12,11 +12,11 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/api/plugins/plugins_handler.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/plugin_service.h" #include "content/public/common/pepper_plugin_info.h" +#include "extensions/common/extension.h" #include "url/gurl.h" using content::PluginService; diff --git a/chrome/browser/extensions/policy_handlers.cc b/chrome/browser/extensions/policy_handlers.cc index 2637726..5b80cc35 100644 --- a/chrome/browser/extensions/policy_handlers.cc +++ b/chrome/browser/extensions/policy_handlers.cc @@ -9,8 +9,8 @@ #include "chrome/browser/extensions/external_policy_loader.h" #include "chrome/browser/policy/policy_error_map.h" #include "chrome/browser/policy/policy_map.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "policy/policy_constants.h" diff --git a/chrome/browser/extensions/requirements_checker.cc b/chrome/browser/extensions/requirements_checker.cc index f1a5417..7a61033 100644 --- a/chrome/browser/extensions/requirements_checker.cc +++ b/chrome/browser/extensions/requirements_checker.cc @@ -7,9 +7,9 @@ #include "base/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/gpu/gpu_feature_checker.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/requirements_handler.h" #include "content/public/browser/browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "gpu/config/gpu_feature_type.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/requirements_checker_browsertest.cc b/chrome/browser/extensions/requirements_checker_browsertest.cc index 73bbfbd..6378424 100644 --- a/chrome/browser/extensions/requirements_checker_browsertest.cc +++ b/chrome/browser/extensions/requirements_checker_browsertest.cc @@ -15,10 +15,10 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/requirements_checker.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/gpu_data_manager.h" +#include "extensions/common/extension.h" #include "gpu/config/gpu_info.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/sandboxed_unpacker.cc b/chrome/browser/extensions/sandboxed_unpacker.cc index 6832bfd..6dd89c9 100644 --- a/chrome/browser/extensions/sandboxed_unpacker.cc +++ b/chrome/browser/extensions/sandboxed_unpacker.cc @@ -24,7 +24,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_utility_messages.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" @@ -34,6 +33,7 @@ #include "crypto/signature_verifier.h" #include "extensions/common/constants.h" #include "extensions/common/crx_file.h" +#include "extensions/common/extension.h" #include "extensions/common/id_util.h" #include "extensions/common/manifest_constants.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/sandboxed_unpacker_unittest.cc b/chrome/browser/extensions/sandboxed_unpacker_unittest.cc index 7428cba..5f7e673 100644 --- a/chrome/browser/extensions/sandboxed_unpacker_unittest.cc +++ b/chrome/browser/extensions/sandboxed_unpacker_unittest.cc @@ -12,11 +12,11 @@ #include "base/values.h" #include "chrome/browser/extensions/sandboxed_unpacker.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/render_process_host.h" #include "content/public/test/test_browser_thread_bundle.h" #include "content/public/test/test_utils.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/extensions/script_badge_controller.cc b/chrome/browser/extensions/script_badge_controller.cc index 72dbfee..d701652 100644 --- a/chrome/browser/extensions/script_badge_controller.cc +++ b/chrome/browser/extensions/script_badge_controller.cc @@ -16,7 +16,6 @@ #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_id.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/extension_set.h" #include "content/public/browser/navigation_controller.h" @@ -24,6 +23,7 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_macros.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/script_badge_controller_unittest.cc b/chrome/browser/extensions/script_badge_controller_unittest.cc index f55f5c2..0eab0f5 100644 --- a/chrome/browser/extensions/script_badge_controller_unittest.cc +++ b/chrome/browser/extensions/script_badge_controller_unittest.cc @@ -16,7 +16,6 @@ #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" @@ -26,6 +25,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #include "extensions/common/feature_switch.h" #include "extensions/common/value_builder.h" diff --git a/chrome/browser/extensions/script_bubble_controller.cc b/chrome/browser/extensions/script_bubble_controller.cc index a47d24a..7ea4e0f 100644 --- a/chrome/browser/extensions/script_bubble_controller.cc +++ b/chrome/browser/extensions/script_bubble_controller.cc @@ -12,8 +12,8 @@ #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/location_bar_controller.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/navigation_details.h" +#include "extensions/common/extension.h" #include "extensions/common/permissions/api_permission.h" using extensions::APIPermission; diff --git a/chrome/browser/extensions/script_bubble_controller_unittest.cc b/chrome/browser/extensions/script_bubble_controller_unittest.cc index d3876aa..4c39776 100644 --- a/chrome/browser/extensions/script_bubble_controller_unittest.cc +++ b/chrome/browser/extensions/script_bubble_controller_unittest.cc @@ -15,12 +15,12 @@ #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/script_bubble_controller.h" #include "chrome/browser/extensions/test_extension_system.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_entry.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #include "extensions/common/feature_switch.h" #include "extensions/common/value_builder.h" diff --git a/chrome/browser/extensions/standard_management_policy_provider.cc b/chrome/browser/extensions/standard_management_policy_provider.cc index 2bdaa94..ae51540 100644 --- a/chrome/browser/extensions/standard_management_policy_provider.cc +++ b/chrome/browser/extensions/standard_management_policy_provider.cc @@ -7,9 +7,9 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/extensions/blacklist.h" #include "chrome/browser/extensions/extension_prefs.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "extensions/browser/admin_policy.h" +#include "extensions/common/extension.h" namespace extensions { diff --git a/chrome/browser/extensions/startup_helper.cc b/chrome/browser/extensions/startup_helper.cc index 0362c95..6277e5d 100644 --- a/chrome/browser/extensions/startup_helper.cc +++ b/chrome/browser/extensions/startup_helper.cc @@ -19,9 +19,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/chrome_extensions_client.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "ipc/ipc_message.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/state_store.cc b/chrome/browser/extensions/state_store.cc index bf3d4f8..a12dc51 100644 --- a/chrome/browser/extensions/state_store.cc +++ b/chrome/browser/extensions/state_store.cc @@ -7,9 +7,9 @@ #include "base/bind.h" #include "base/message_loop/message_loop.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "extensions/common/extension.h" namespace { diff --git a/chrome/browser/extensions/subscribe_page_action_browsertest.cc b/chrome/browser/extensions/subscribe_page_action_browsertest.cc index 4c6d950..fd37075 100644 --- a/chrome/browser/extensions/subscribe_page_action_browsertest.cc +++ b/chrome/browser/extensions/subscribe_page_action_browsertest.cc @@ -5,12 +5,12 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test_utils.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" using content::WebContents; using extensions::Extension; diff --git a/chrome/browser/extensions/suggest_permission_util.cc b/chrome/browser/extensions/suggest_permission_util.cc index 7eb1e10..f5b68b8 100644 --- a/chrome/browser/extensions/suggest_permission_util.cc +++ b/chrome/browser/extensions/suggest_permission_util.cc @@ -5,11 +5,11 @@ #include "chrome/browser/extensions/suggest_permission_util.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "content/public/browser/render_view_host.h" #include "content/public/common/console_message_level.h" #include "extensions/browser/process_manager.h" +#include "extensions/common/extension.h" #include "extensions/common/permissions/permissions_info.h" using content::CONSOLE_MESSAGE_LEVEL_WARNING; diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc index 9c9cf0a..1ce6228 100644 --- a/chrome/browser/extensions/tab_helper.cc +++ b/chrome/browser/extensions/tab_helper.cc @@ -30,7 +30,6 @@ #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/web_applications/web_app_ui.h" #include "chrome/browser/web_applications/web_app.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/extension_messages.h" @@ -50,6 +49,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "extensions/browser/extension_error.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "extensions/common/extension_urls.h" #include "extensions/common/feature_switch.h" diff --git a/chrome/browser/extensions/test_extension_environment.cc b/chrome/browser/extensions/test_extension_environment.cc index 805ea2d..dd3fa44 100644 --- a/chrome/browser/extensions/test_extension_environment.cc +++ b/chrome/browser/extensions/test_extension_environment.cc @@ -11,10 +11,10 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/browser/sessions/session_tab_helper.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_utils.h" #include "content/public/test/web_contents_tester.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #include "extensions/common/value_builder.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc index d525c07..6118f61 100644 --- a/chrome/browser/extensions/test_extension_prefs.cc +++ b/chrome/browser/extensions/test_extension_prefs.cc @@ -21,9 +21,9 @@ #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/prefs/pref_service_mock_builder.h" #include "chrome/browser/prefs/pref_service_syncable.h" -#include "chrome/common/extensions/extension.h" #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "sync/api/string_ordinal.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.cc b/chrome/browser/extensions/theme_installed_infobar_delegate.cc index be6ede8..11766fa 100644 --- a/chrome/browser/extensions/theme_installed_infobar_delegate.cc +++ b/chrome/browser/extensions/theme_installed_infobar_delegate.cc @@ -15,8 +15,8 @@ #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/unpacked_installer.cc b/chrome/browser/extensions/unpacked_installer.cc index 13db0f5..52de886 100644 --- a/chrome/browser/extensions/unpacked_installer.cc +++ b/chrome/browser/extensions/unpacked_installer.cc @@ -16,10 +16,10 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/permissions_updater.h" #include "chrome/common/extensions/api/plugins/plugins_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/extension_l10n_util.h" #include "content/public/browser/browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/id_util.h" #include "extensions/common/manifest.h" #include "sync/api/string_ordinal.h" diff --git a/chrome/browser/extensions/updater/extension_downloader.h b/chrome/browser/extensions/updater/extension_downloader.h index c6cd826..3a5cbc9 100644 --- a/chrome/browser/extensions/updater/extension_downloader.h +++ b/chrome/browser/extensions/updater/extension_downloader.h @@ -21,8 +21,8 @@ #include "chrome/browser/extensions/updater/extension_downloader_delegate.h" #include "chrome/browser/extensions/updater/manifest_fetch_data.h" #include "chrome/browser/extensions/updater/request_queue.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/update_manifest.h" +#include "extensions/common/extension.h" #include "net/url_request/url_fetcher_delegate.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc index aa3fc4b..9d45712 100644 --- a/chrome/browser/extensions/updater/extension_updater.cc +++ b/chrome/browser/extensions/updater/extension_updater.cc @@ -23,7 +23,6 @@ #include "chrome/browser/extensions/pending_extension_manager.h" #include "chrome/browser/extensions/updater/extension_downloader.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" @@ -32,6 +31,7 @@ #include "content/public/browser/notification_source.h" #include "crypto/sha2.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" using base::RandDouble; diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc index c917e27..d7e963f 100644 --- a/chrome/browser/extensions/updater/extension_updater_unittest.cc +++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc @@ -38,7 +38,6 @@ #include "chrome/browser/extensions/updater/request_queue_impl.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/prefs/pref_service_syncable.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/omaha_query_params/omaha_query_params.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" @@ -50,6 +49,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/test/test_browser_thread_bundle.h" #include "content/public/test/test_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/id_util.h" #include "extensions/common/manifest_constants.h" #include "libxml/globals.h" diff --git a/chrome/browser/extensions/user_script_listener.cc b/chrome/browser/extensions/user_script_listener.cc index 1e2c587..b04b326 100644 --- a/chrome/browser/extensions/user_script_listener.cc +++ b/chrome/browser/extensions/user_script_listener.cc @@ -8,12 +8,12 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/resource_controller.h" #include "content/public/browser/resource_throttle.h" +#include "extensions/common/extension.h" #include "extensions/common/url_pattern.h" #include "net/url_request/url_request.h" diff --git a/chrome/browser/extensions/user_script_master.cc b/chrome/browser/extensions/user_script_master.cc index 4a9ff1c..3c3dc69 100644 --- a/chrome/browser/extensions/user_script_master.cc +++ b/chrome/browser/extensions/user_script_master.cc @@ -23,13 +23,13 @@ #include "chrome/browser/extensions/image_loader.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/i18n/default_locale_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" #include "chrome/common/extensions/message_bundle.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/extensions/webstore_ephemeral_installer.cc b/chrome/browser/extensions/webstore_ephemeral_installer.cc index 31f7a04..0dc0ad2 100644 --- a/chrome/browser/extensions/webstore_ephemeral_installer.cc +++ b/chrome/browser/extensions/webstore_ephemeral_installer.cc @@ -9,10 +9,10 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/extensions/application_launch.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/common/permissions/permissions_data.h" using content::WebContents; diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc index d4c9c2f..cdcf376 100644 --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc @@ -29,7 +29,6 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_handlers/shared_module_info.h" #include "chrome/common/omaha_query_params/omaha_query_params.h" @@ -45,6 +44,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "net/base/escape.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/webstore_standalone_installer.cc b/chrome/browser/extensions/webstore_standalone_installer.cc index 9f13c3c..7ee425d 100644 --- a/chrome/browser/extensions/webstore_standalone_installer.cc +++ b/chrome/browser/extensions/webstore_standalone_installer.cc @@ -11,8 +11,8 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/webstore_data_fetcher.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "url/gurl.h" using content::WebContents; diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc index 81a9c3f..8046651 100644 --- a/chrome/browser/extensions/window_open_apitest.cc +++ b/chrome/browser/extensions/window_open_apitest.cc @@ -18,7 +18,6 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/test_switches.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/render_process_host.h" @@ -26,6 +25,7 @@ #include "content/public/common/result_codes.h" #include "content/public/test/browser_test_utils.h" #include "extensions/browser/process_manager.h" +#include "extensions/common/extension.h" #include "extensions/common/switches.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc index 6063442..6f6d9b6 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc @@ -18,11 +18,11 @@ #include "chrome/browser/extensions/suggest_permission_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/view_type_utils.h" +#include "extensions/common/extension.h" using extensions::APIPermission; diff --git a/chrome/browser/history/shortcuts_backend.cc b/chrome/browser/history/shortcuts_backend.cc index 27dbae9..3fba50e 100644 --- a/chrome/browser/history/shortcuts_backend.cc +++ b/chrome/browser/history/shortcuts_backend.cc @@ -22,10 +22,10 @@ #include "chrome/browser/omnibox/omnibox_log.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" using content::BrowserThread; diff --git a/chrome/browser/infobars/infobar_extension_api.cc b/chrome/browser/infobars/infobar_extension_api.cc index fc2d9ad..7b91f24 100644 --- a/chrome/browser/infobars/infobar_extension_api.cc +++ b/chrome/browser/infobars/infobar_extension_api.cc @@ -15,10 +15,10 @@ #include "chrome/browser/infobars/confirm_infobar_delegate.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" using extensions::Extension; diff --git a/chrome/browser/managed_mode/managed_mode_site_list.cc b/chrome/browser/managed_mode/managed_mode_site_list.cc index 977a23e..2689cab 100644 --- a/chrome/browser/managed_mode/managed_mode_site_list.cc +++ b/chrome/browser/managed_mode/managed_mode_site_list.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" using base::DictionaryValue; using base::ListValue; diff --git a/chrome/browser/managed_mode/managed_user_service_unittest.cc b/chrome/browser/managed_mode/managed_user_service_unittest.cc index d13b5b1..d434c1f 100644 --- a/chrome/browser/managed_mode/managed_user_service_unittest.cc +++ b/chrome/browser/managed_mode/managed_user_service_unittest.cc @@ -18,12 +18,12 @@ #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread_bundle.h" #include "content/public/test/test_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc index 9c19064..d0fdc07 100644 --- a/chrome/browser/media/media_capture_devices_dispatcher.cc +++ b/chrome/browser/media/media_capture_devices_dispatcher.cc @@ -21,7 +21,6 @@ #include "chrome/browser/ui/screen_capture_notification_ui.h" #include "chrome/browser/ui/simple_message_box.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" @@ -33,6 +32,7 @@ #include "content/public/common/desktop_media_id.h" #include "content/public/common/media_stream_request.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "media/audio/audio_manager_base.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/media/media_stream_capture_indicator.cc b/chrome/browser/media/media_stream_capture_indicator.cc index 6a375d3..0312f85 100644 --- a/chrome/browser/media/media_stream_capture_indicator.cc +++ b/chrome/browser/media/media_stream_capture_indicator.cc @@ -17,7 +17,6 @@ #include "chrome/browser/status_icons/status_icon.h" #include "chrome/browser/status_icons/status_tray.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" @@ -25,6 +24,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents_observer.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/media/protected_media_identifier_permission_context.cc b/chrome/browser/media/protected_media_identifier_permission_context.cc index 258d817..e56b41a 100644 --- a/chrome/browser/media/protected_media_identifier_permission_context.cc +++ b/chrome/browser/media/protected_media_identifier_permission_context.cc @@ -18,12 +18,12 @@ #include "chrome/browser/extensions/suggest_permission_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/view_type_utils.h" +#include "extensions/common/extension.h" using extensions::APIPermission; diff --git a/chrome/browser/media_galleries/media_file_system_registry.cc b/chrome/browser/media_galleries/media_file_system_registry.cc index 0dcd520..e971288 100644 --- a/chrome/browser/media_galleries/media_file_system_registry.cc +++ b/chrome/browser/media_galleries/media_file_system_registry.cc @@ -27,7 +27,6 @@ #include "chrome/browser/storage_monitor/media_storage_util.h" #include "chrome/browser/storage_monitor/storage_monitor.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/pref_names.h" @@ -41,6 +40,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "webkit/browser/fileapi/isolated_context.h" #include "webkit/common/fileapi/file_system_types.h" diff --git a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc index a122bf5..09912b0 100644 --- a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc +++ b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc @@ -34,7 +34,6 @@ #include "chrome/browser/storage_monitor/storage_monitor.h" #include "chrome/browser/storage_monitor/test_storage_monitor.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" @@ -45,6 +44,7 @@ #include "content/public/test/mock_render_process_host.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/web_contents_tester.h" +#include "extensions/common/extension.h" #include "sync/api/string_ordinal.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/media_galleries/media_galleries_dialog_controller.cc b/chrome/browser/media_galleries/media_galleries_dialog_controller.cc index b409078..af69c38 100644 --- a/chrome/browser/media_galleries/media_galleries_dialog_controller.cc +++ b/chrome/browser/media_galleries/media_galleries_dialog_controller.cc @@ -17,11 +17,11 @@ #include "chrome/browser/storage_monitor/storage_info.h" #include "chrome/browser/storage_monitor/storage_monitor.h" #include "chrome/browser/ui/chrome_select_file_policy.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/permissions/media_galleries_permission.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/common/extension.h" +#include "extensions/common/permissions/permissions_data.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" diff --git a/chrome/browser/media_galleries/media_galleries_preferences.cc b/chrome/browser/media_galleries/media_galleries_preferences.cc index e6671fc8..fffa94a 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences.cc @@ -27,13 +27,13 @@ #include "chrome/browser/storage_monitor/media_storage_util.h" #include "chrome/browser/storage_monitor/storage_monitor.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/permissions/media_galleries_permission.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/pref_names.h" #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/permissions/api_permission.h" +#include "extensions/common/permissions/permissions_data.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/text/bytes_formatting.h" diff --git a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc index cf5c516..bbcab9e 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc @@ -19,9 +19,9 @@ #include "chrome/browser/storage_monitor/media_storage_util.h" #include "chrome/browser/storage_monitor/storage_monitor.h" #include "chrome/browser/storage_monitor/test_storage_monitor.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/background_info.h" #include "grit/generated_resources.h" #include "sync/api/string_ordinal.h" diff --git a/chrome/browser/media_galleries/media_galleries_test_util.cc b/chrome/browser/media_galleries/media_galleries_test_util.cc index 5530a64..4696003 100644 --- a/chrome/browser/media_galleries/media_galleries_test_util.cc +++ b/chrome/browser/media_galleries/media_galleries_test_util.cc @@ -19,7 +19,7 @@ #include "chrome/browser/media_galleries/fileapi/picasa_finder.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc index 7c6780c..f2f07b1 100644 --- a/chrome/browser/memory_details.cc +++ b/chrome/browser/memory_details.cc @@ -12,7 +12,6 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "components/nacl/common/nacl_process_type.h" #include "content/public/browser/browser_child_process_host_iterator.h" @@ -27,6 +26,7 @@ #include "content/public/common/bindings_policy.h" #include "extensions/browser/process_manager.h" #include "extensions/browser/view_type_utils.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc b/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc index 7f160177..756d84e 100644 --- a/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc +++ b/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc @@ -15,12 +15,12 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths_internal.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/shared_module_info.h" #include "chrome/common/logging_chrome.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/info_map.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/url_pattern.h" #include "ppapi/c/private/ppb_nacl_private.h" diff --git a/chrome/browser/notifications/notification_options_menu_model.cc b/chrome/browser/notifications/notification_options_menu_model.cc index 7a11a1a..6bec0d8 100644 --- a/chrome/browser/notifications/notification_options_menu_model.cc +++ b/chrome/browser/notifications/notification_options_menu_model.cc @@ -25,10 +25,10 @@ #include "chrome/browser/ui/host_desktop.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/content_settings_types.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents_delegate.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/notifications/notification_system_observer.cc b/chrome/browser/notifications/notification_system_observer.cc index 1ec0182..b36b150 100644 --- a/chrome/browser/notifications/notification_system_observer.cc +++ b/chrome/browser/notifications/notification_system_observer.cc @@ -8,8 +8,8 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/notifications/notification_ui_manager.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_service.h" +#include "extensions/common/extension.h" NotificationSystemObserver::NotificationSystemObserver( NotificationUIManager* ui_manager) diff --git a/chrome/browser/performance_monitor/database_unittest.cc b/chrome/browser/performance_monitor/database_unittest.cc index 950c183..dd4b012 100644 --- a/chrome/browser/performance_monitor/database_unittest.cc +++ b/chrome/browser/performance_monitor/database_unittest.cc @@ -14,7 +14,7 @@ #include "chrome/browser/performance_monitor/key_builder.h" #include "chrome/browser/performance_monitor/metric.h" #include "chrome/browser/performance_monitor/performance_monitor_util.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" diff --git a/chrome/browser/performance_monitor/performance_monitor.cc b/chrome/browser/performance_monitor/performance_monitor.cc index fefe7c7..fb5bcf7 100644 --- a/chrome/browser/performance_monitor/performance_monitor.cc +++ b/chrome/browser/performance_monitor/performance_monitor.cc @@ -28,7 +28,6 @@ #include "chrome/browser/ui/browser_iterator.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "content/public/browser/browser_child_process_host.h" #include "content/public/browser/browser_child_process_host_iterator.h" @@ -41,6 +40,7 @@ #include "content/public/browser/render_widget_host.h" #include "content/public/browser/render_widget_host_iterator.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "net/url_request/url_request.h" using content::BrowserThread; diff --git a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc index 7166e75..045d893 100644 --- a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc +++ b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc @@ -32,7 +32,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_registrar.h" @@ -41,6 +40,7 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" #include "content/public/test/test_utils.h" +#include "extensions/common/extension.h" #if defined(OS_CHROMEOS) #include "chromeos/chromeos_switches.h" diff --git a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc index 53bda5b..8afdf77 100644 --- a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc +++ b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc @@ -24,7 +24,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "net/url_request/url_request_context_getter.h" #include "policy/proto/cloud_policy.pb.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 3d52761..c5183bf09 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -75,7 +75,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_pattern.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/pref_names.h" @@ -115,6 +114,7 @@ #include "content/test/net/url_request_mock_http_job.h" #include "extensions/browser/process_manager.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" diff --git a/chrome/browser/profile_resetter/brandcoded_default_settings.cc b/chrome/browser/profile_resetter/brandcoded_default_settings.cc index c47e79e..8b32afa 100644 --- a/chrome/browser/profile_resetter/brandcoded_default_settings.cc +++ b/chrome/browser/profile_resetter/brandcoded_default_settings.cc @@ -6,9 +6,9 @@ #include "base/json/json_string_value_serializer.h" #include "base/logging.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/installer/util/master_preferences_constants.h" +#include "extensions/common/extension.h" BrandcodedDefaultSettings::BrandcodedDefaultSettings() { } diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc index 45818a2..e433212 100644 --- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc +++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc @@ -21,11 +21,11 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "net/http/http_response_headers.h" #include "net/http/http_status_code.h" diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc index a84232e..6d25836 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl.cc @@ -40,7 +40,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" @@ -51,6 +50,7 @@ #include "content/public/browser/storage_partition.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "net/http/http_server_properties.h" #include "net/http/transport_security_state.h" #include "webkit/browser/database/database_tracker.h" diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.cc b/chrome/browser/profiles/off_the_record_profile_io_data.cc index 638e026e..7fefc5a 100644 --- a/chrome/browser/profiles/off_the_record_profile_io_data.cc +++ b/chrome/browser/profiles/off_the_record_profile_io_data.cc @@ -21,12 +21,12 @@ #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/resource_context.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "net/ftp/ftp_network_layer.h" #include "net/http/http_cache.h" #include "net/http/http_network_session.h" diff --git a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc index 621e6b1..953fd6c 100644 --- a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc +++ b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc @@ -10,13 +10,13 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pepper_permission_util.h" #include "content/public/browser/browser_ppapi_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/render_view_host.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "ppapi/c/pp_errors.h" #include "ppapi/host/dispatch_host_message.h" #include "ppapi/host/host_message_context.h" diff --git a/chrome/browser/search_engines/template_url_service_unittest.cc b/chrome/browser/search_engines/template_url_service_unittest.cc index c40e7e0..dda708c 100644 --- a/chrome/browser/search_engines/template_url_service_unittest.cc +++ b/chrome/browser/search_engines/template_url_service_unittest.cc @@ -25,12 +25,12 @@ #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_test_util.h" #include "chrome/browser/webdata/web_data_service_factory.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_profile.h" #include "components/webdata/common/web_database.h" #include "content/public/test/test_browser_thread.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc index 16b18fc..75fcc7f 100644 --- a/chrome/browser/sessions/session_service.cc +++ b/chrome/browser/sessions/session_service.cc @@ -36,7 +36,6 @@ #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/startup/startup_browser_creator.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "components/startup_metric_utils/startup_metric_utils.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" @@ -44,6 +43,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/session_storage_namespace.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #if defined(OS_MACOSX) #include "chrome/browser/app_controller_mac.h" diff --git a/chrome/browser/sessions/tab_restore_service_helper.cc b/chrome/browser/sessions/tab_restore_service_helper.cc index 0ea97a7..e33a298 100644 --- a/chrome/browser/sessions/tab_restore_service_helper.cc +++ b/chrome/browser/sessions/tab_restore_service_helper.cc @@ -16,13 +16,13 @@ #include "chrome/browser/sessions/session_types.h" #include "chrome/browser/sessions/tab_restore_service_delegate.h" #include "chrome/browser/sessions/tab_restore_service_observer.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/url_constants.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" -#include "content/public/browser/web_contents.h" #include "content/public/browser/session_storage_namespace.h" +#include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #if !defined(OS_ANDROID) #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" diff --git a/chrome/browser/speech/extension_api/tts_engine_extension_api.cc b/chrome/browser/speech/extension_api/tts_engine_extension_api.cc index b5d0a6a..87c9c3a 100644 --- a/chrome/browser/speech/extension_api/tts_engine_extension_api.cc +++ b/chrome/browser/speech/extension_api/tts_engine_extension_api.cc @@ -17,12 +17,12 @@ #include "chrome/browser/speech/extension_api/tts_extension_api_constants.h" #include "chrome/browser/speech/tts_controller.h" #include "chrome/common/extensions/api/speech/tts_engine_manifest_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/common/console_message_level.h" #include "extensions/browser/process_manager.h" +#include "extensions/common/extension.h" #include "net/base/network_change_notifier.h" using extensions::EventRouter; diff --git a/chrome/browser/speech/tts_controller.cc b/chrome/browser/speech/tts_controller.cc index 34f72a4..902168c 100644 --- a/chrome/browser/speech/tts_controller.cc +++ b/chrome/browser/speech/tts_controller.cc @@ -15,7 +15,7 @@ #include "chrome/browser/speech/extension_api/tts_extension_api.h" #include "chrome/browser/speech/tts_platform.h" #include "chrome/common/extensions/api/speech/tts_engine_manifest_handler.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" namespace { // A value to be used to indicate that there is no char index available. diff --git a/chrome/browser/sync/glue/extensions_activity_monitor.cc b/chrome/browser/sync/glue/extensions_activity_monitor.cc index b8de3bb..5768718 100644 --- a/chrome/browser/sync/glue/extensions_activity_monitor.cc +++ b/chrome/browser/sync/glue/extensions_activity_monitor.cc @@ -7,9 +7,9 @@ #include "base/bind.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" +#include "extensions/common/extension.h" #include "sync/util/extensions_activity.h" using content::BrowserThread; diff --git a/chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc b/chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc index 3f17c4b..9afdb3e 100644 --- a/chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc +++ b/chrome/browser/sync/glue/extensions_activity_monitor_unittest.cc @@ -11,9 +11,9 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "sync/util/extensions_activity.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/glue/synced_tab_delegate_android.cc b/chrome/browser/sync/glue/synced_tab_delegate_android.cc index 8585537..3de039e 100644 --- a/chrome/browser/sync/glue/synced_tab_delegate_android.cc +++ b/chrome/browser/sync/glue/synced_tab_delegate_android.cc @@ -11,10 +11,10 @@ #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/sync/glue/synced_window_delegate.h" #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" using content::NavigationEntry; diff --git a/chrome/browser/sync/test/integration/extension_settings_helper.cc b/chrome/browser/sync/test/integration/extension_settings_helper.cc index d2af3f3..acfb2fc 100644 --- a/chrome/browser/sync/test/integration/extension_settings_helper.cc +++ b/chrome/browser/sync/test/integration/extension_settings_helper.cc @@ -17,9 +17,9 @@ #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" #include "chrome/browser/sync/test/integration/sync_extension_helper.h" #include "chrome/browser/value_store/value_store.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "content/public/browser/browser_thread.h" +#include "extensions/common/extension.h" using content::BrowserThread; using sync_datatype_helper::test; diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc index 75a69e6..0625e79 100644 --- a/chrome/browser/sync/test/integration/sync_extension_helper.cc +++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc @@ -16,7 +16,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" #include "chrome/browser/sync/test/integration/sync_test.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/id_util.h" #include "extensions/common/manifest_constants.h" #include "sync/api/string_ordinal.h" diff --git a/chrome/browser/sync/test/integration/themes_helper.cc b/chrome/browser/sync/test/integration/themes_helper.cc index 887b31c..e16f432 100644 --- a/chrome/browser/sync/test/integration/themes_helper.cc +++ b/chrome/browser/sync/test/integration/themes_helper.cc @@ -10,7 +10,7 @@ #include "chrome/browser/sync/test/integration/sync_extension_helper.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/id_util.h" #include "extensions/common/manifest.h" diff --git a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc index e226fe3..d88a05e 100644 --- a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc +++ b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc @@ -18,8 +18,8 @@ #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h" #include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" +#include "extensions/common/extension.h" namespace sync_file_system { namespace drive_backend { diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc index 6a3068c..f531216 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc @@ -10,8 +10,8 @@ #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" -#include "chrome/common/extensions/extension.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" namespace sync_file_system { diff --git a/chrome/browser/sync_file_system/drive_backend_v1/api_util.cc b/chrome/browser/sync_file_system/drive_backend_v1/api_util.cc index 773a992..c5488b5 100644 --- a/chrome/browser/sync_file_system/drive_backend_v1/api_util.cc +++ b/chrome/browser/sync_file_system/drive_backend_v1/api_util.cc @@ -26,9 +26,9 @@ #include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_util.h" #include "chrome/browser/sync_file_system/logger.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "net/base/mime_util.h" namespace sync_file_system { diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc index aaa6a9a..43116e0 100644 --- a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc +++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.cc @@ -32,9 +32,9 @@ #include "chrome/browser/sync_file_system/sync_file_system.pb.h" #include "chrome/browser/sync_file_system/sync_file_type.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "webkit/browser/fileapi/file_system_url.h" #include "webkit/common/blob/scoped_file.h" #include "webkit/common/fileapi/file_system_util.h" diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_fake_unittest.cc b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_fake_unittest.cc index 54e0c26..9d8ec48 100644 --- a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_fake_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_fake_unittest.cc @@ -28,9 +28,9 @@ #include "chrome/browser/sync_file_system/sync_file_metadata.h" #include "chrome/browser/sync_file_system/sync_file_system.pb.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #include "extensions/common/id_util.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/sync_file_system/sync_file_system_service.cc b/chrome/browser/sync_file_system/sync_file_system_service.cc index f4239fd..f57a6e1 100644 --- a/chrome/browser/sync_file_system/sync_file_system_service.cc +++ b/chrome/browser/sync_file_system/sync_file_system_service.cc @@ -26,12 +26,12 @@ #include "chrome/browser/sync_file_system/sync_file_metadata.h" #include "chrome/browser/sync_file_system/sync_status_code.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" -#include "chrome/common/extensions/extension.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/storage_partition.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "url/gurl.h" #include "webkit/browser/fileapi/file_system_context.h" diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 00e6bda..b9e75e8 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -61,7 +61,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/content_restriction.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/net/url_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" @@ -83,6 +82,7 @@ #include "content/public/common/ssl_status.h" #include "content/public/common/url_utils.h" #include "extensions/browser/view_type_utils.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "net/base/escape.h" #include "third_party/WebKit/public/web/WebContextMenuData.h" diff --git a/chrome/browser/task_manager/background_resource_provider.cc b/chrome/browser/task_manager/background_resource_provider.cc index 9ffaece..58cd7ba 100644 --- a/chrome/browser/task_manager/background_resource_provider.cc +++ b/chrome/browser/task_manager/background_resource_provider.cc @@ -18,11 +18,11 @@ #include "chrome/browser/task_manager/renderer_resource.h" #include "chrome/browser/task_manager/resource_provider.h" #include "chrome/browser/task_manager/task_manager.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/task_manager/extension_process_resource_provider.cc b/chrome/browser/task_manager/extension_process_resource_provider.cc index 4a0ab96..67adbd2 100644 --- a/chrome/browser/task_manager/extension_process_resource_provider.cc +++ b/chrome/browser/task_manager/extension_process_resource_provider.cc @@ -16,7 +16,6 @@ #include "chrome/browser/task_manager/resource_provider.h" #include "chrome/browser/task_manager/task_manager.h" #include "chrome/browser/task_manager/task_manager_util.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" @@ -25,6 +24,7 @@ #include "content/public/browser/web_contents.h" #include "extensions/browser/process_manager.h" #include "extensions/browser/view_type_utils.h" +#include "extensions/common/extension.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/task_manager/panel_resource_provider.cc b/chrome/browser/task_manager/panel_resource_provider.cc index c078ba3..c381675 100644 --- a/chrome/browser/task_manager/panel_resource_provider.cc +++ b/chrome/browser/task_manager/panel_resource_provider.cc @@ -14,12 +14,12 @@ #include "chrome/browser/task_manager/task_manager_util.h" #include "chrome/browser/ui/panels/panel.h" #include "chrome/browser/ui/panels/panel_manager.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/view_type_utils.h" +#include "extensions/common/extension.h" #include "ui/base/l10n/l10n_util.h" using content::RenderProcessHost; diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index f77bea4..b28c930 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -31,13 +31,13 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_service.h" #include "content/public/common/content_switches.h" #include "content/public/common/page_transition_types.h" #include "content/public/test/browser_test_utils.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" diff --git a/chrome/browser/themes/browser_theme_pack.h b/chrome/browser/themes/browser_theme_pack.h index 9af9686..9777b04 100644 --- a/chrome/browser/themes/browser_theme_pack.h +++ b/chrome/browser/themes/browser_theme_pack.h @@ -13,7 +13,7 @@ #include "base/memory/scoped_ptr.h" #include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/themes/custom_theme_supplier.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/layout.h" #include "ui/gfx/color_utils.h" diff --git a/chrome/browser/themes/theme_service_unittest.cc b/chrome/browser/themes/theme_service_unittest.cc index 19b78f9..5bbec2f 100644 --- a/chrome/browser/themes/theme_service_unittest.cc +++ b/chrome/browser/themes/theme_service_unittest.cc @@ -14,12 +14,12 @@ #include "chrome/browser/themes/custom_theme_supplier.h" #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" #include "content/public/test/test_utils.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" namespace theme_service_internal { diff --git a/chrome/browser/themes/theme_syncable_service.cc b/chrome/browser/themes/theme_syncable_service.cc index 55d3f74..9a78756 100644 --- a/chrome/browser/themes/theme_syncable_service.cc +++ b/chrome/browser/themes/theme_syncable_service.cc @@ -9,9 +9,9 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_service.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/extensions/sync_helper.h" +#include "extensions/common/extension.h" #include "sync/protocol/sync.pb.h" #include "sync/protocol/theme_specifics.pb.h" diff --git a/chrome/browser/themes/theme_syncable_service_unittest.cc b/chrome/browser/themes/theme_syncable_service_unittest.cc index b95adbe..41532c3 100644 --- a/chrome/browser/themes/theme_syncable_service_unittest.cc +++ b/chrome/browser/themes/theme_syncable_service_unittest.cc @@ -14,11 +14,11 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/api_permission_set.h" #include "extensions/common/permissions/permission_set.h" diff --git a/chrome/browser/ui/app_list/app_list_controller_delegate.cc b/chrome/browser/ui/app_list/app_list_controller_delegate.cc index 6ecaa28..e6bff3e 100644 --- a/chrome/browser/ui/app_list/app_list_controller_delegate.cc +++ b/chrome/browser/ui/app_list/app_list_controller_delegate.cc @@ -10,10 +10,10 @@ #include "chrome/browser/extensions/management_policy.h" #include "chrome/browser/ui/app_list/extension_uninstaller.h" #include "chrome/browser/ui/browser_navigator.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_url_handler.h" +#include "extensions/common/extension.h" #include "net/base/url_util.h" namespace { diff --git a/chrome/browser/ui/app_list/app_list_controller_delegate_impl.cc b/chrome/browser/ui/app_list/app_list_controller_delegate_impl.cc index de3561f..0d84542 100644 --- a/chrome/browser/ui/app_list/app_list_controller_delegate_impl.cc +++ b/chrome/browser/ui/app_list/app_list_controller_delegate_impl.cc @@ -12,8 +12,8 @@ #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/extensions/application_launch.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" +#include "extensions/common/extension.h" #include "net/base/url_util.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/ui/app_list/extension_app_item.cc b/chrome/browser/ui/app_list/extension_app_item.cc index dbeaa11..51f7e99 100644 --- a/chrome/browser/ui/app_list/extension_app_item.cc +++ b/chrome/browser/ui/app_list/extension_app_item.cc @@ -14,12 +14,12 @@ #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" #include "chrome/browser/ui/extensions/extension_enable_flow.h" #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "content/public/browser/user_metrics.h" +#include "extensions/common/extension.h" #include "grit/theme_resources.h" #include "sync/api/string_ordinal.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/app_list/extension_app_model_builder.cc b/chrome/browser/ui/app_list/extension_app_model_builder.cc index 61742c5..d53edc2 100644 --- a/chrome/browser/ui/app_list/extension_app_model_builder.cc +++ b/chrome/browser/ui/app_list/extension_app_model_builder.cc @@ -15,11 +15,11 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" #include "chrome/browser/ui/app_list/extension_app_item.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" +#include "extensions/common/extension.h" #include "ui/gfx/image/image_skia.h" using extensions::Extension; diff --git a/chrome/browser/ui/app_list/extension_uninstaller.cc b/chrome/browser/ui/app_list/extension_uninstaller.cc index ee0c7bd..b8b8b66 100644 --- a/chrome/browser/ui/app_list/extension_uninstaller.cc +++ b/chrome/browser/ui/app_list/extension_uninstaller.cc @@ -8,7 +8,7 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" ExtensionUninstaller::ExtensionUninstaller( Profile* profile, diff --git a/chrome/browser/ui/app_list/recommended_apps.cc b/chrome/browser/ui/app_list/recommended_apps.cc index 5b32f10..43fb2cd 100644 --- a/chrome/browser/ui/app_list/recommended_apps.cc +++ b/chrome/browser/ui/app_list/recommended_apps.cc @@ -14,8 +14,8 @@ #include "chrome/browser/extensions/install_tracker.h" #include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/ui/app_list/recommended_apps_observer.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" +#include "extensions/common/extension.h" namespace app_list { diff --git a/chrome/browser/ui/app_list/search/app_result.cc b/chrome/browser/ui/app_list/search/app_result.cc index d537c6b..8db4ddd 100644 --- a/chrome/browser/ui/app_list/search/app_result.cc +++ b/chrome/browser/ui/app_list/search/app_result.cc @@ -15,10 +15,10 @@ #include "chrome/browser/ui/app_list/search/tokenized_string_match.h" #include "chrome/browser/ui/extensions/extension_enable_flow.h" #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "content/public/browser/user_metrics.h" +#include "extensions/common/extension.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/image/image_skia_operations.h" diff --git a/chrome/browser/ui/app_list/search/webstore/webstore_result.cc b/chrome/browser/ui/app_list/search/webstore/webstore_result.cc index 4610967..994b9b9 100644 --- a/chrome/browser/ui/app_list/search/webstore/webstore_result.cc +++ b/chrome/browser/ui/app_list/search/webstore/webstore_result.cc @@ -22,7 +22,7 @@ #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/app_list/start_page_service.cc b/chrome/browser/ui/app_list/start_page_service.cc index c4f4adc..cebb93c 100644 --- a/chrome/browser/ui/app_list/start_page_service.cc +++ b/chrome/browser/ui/app_list/start_page_service.cc @@ -16,7 +16,6 @@ #include "chrome/browser/ui/app_list/recommended_apps.h" #include "chrome/browser/ui/app_list/start_page_observer.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" @@ -25,6 +24,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" +#include "extensions/common/extension.h" namespace app_list { diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc index adf5498..a8caa9f 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc @@ -61,7 +61,6 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/pref_names.h" @@ -70,6 +69,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "extensions/common/url_pattern.h" #include "grit/ash_resources.h" diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc index 212ca9d..03f3f91 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc @@ -34,7 +34,6 @@ #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/browser_with_test_window_test.h" @@ -42,6 +41,7 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/models/menu_model.h" diff --git a/chrome/browser/ui/ash/launcher/launcher_app_tab_helper.cc b/chrome/browser/ui/ash/launcher/launcher_app_tab_helper.cc index 2ea38ba..ec5fb28 100644 --- a/chrome/browser/ui/ash/launcher/launcher_app_tab_helper.cc +++ b/chrome/browser/ui/ash/launcher/launcher_app_tab_helper.cc @@ -11,9 +11,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser_finder.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" namespace { diff --git a/chrome/browser/ui/ash/launcher/launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/launcher_item_controller.cc index f8858bc..e97b9c6 100644 --- a/chrome/browser/ui/ash/launcher/launcher_item_controller.cc +++ b/chrome/browser/ui/ash/launcher/launcher_item_controller.cc @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" LauncherItemController::LauncherItemController( Type type, diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index dab977c..8c82eb4 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -143,7 +143,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/custom_handlers/protocol_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/net/url_fixer_upper.h" #include "chrome/common/pref_names.h" #include "chrome/common/profiling.h" @@ -172,6 +171,7 @@ #include "content/public/common/renderer_preferences.h" #include "content/public/common/webplugininfo.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/background_info.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 3ff253f..8ed4f7a 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -49,7 +49,6 @@ #include "chrome/browser/ui/tabs/pinned_tab_codec.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/translate/language_detection_details.h" #include "chrome/common/url_constants.h" @@ -75,6 +74,7 @@ #include "content/public/common/url_constants.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_navigation_observer.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/dns/mock_host_resolver.h" diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc index 238977c..1b9abfa 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc @@ -31,7 +31,6 @@ #include "chrome/browser/ui/status_bubble.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/web_applications/web_app.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_url_handler.h" @@ -39,6 +38,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/common/extension.h" #if defined(USE_AURA) #include "ui/aura/window.h" diff --git a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm index 5f3cae9..38004c5 100644 --- a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm +++ b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm @@ -11,7 +11,7 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm index b7eb559..1167b5d 100644 --- a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm +++ b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm @@ -18,7 +18,7 @@ #include "chrome/browser/ui/browser_iterator.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" namespace { diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm index 4e90233..30ef4a6 100644 --- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm @@ -14,11 +14,11 @@ #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h" #include "chrome/browser/ui/cocoa/extensions/extension_view_mac.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/common/extension.h" #include "third_party/skia/include/core/SkRegion.h" // NOTE: State Before Update. diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm index 1fc217c..6fcbc55 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm @@ -15,10 +15,10 @@ #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm index 508c771..e21f5dd 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm @@ -20,12 +20,12 @@ #include "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" #include "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller_browsertest.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller_browsertest.mm index 7b14de0..20bf944 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller_browsertest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller_browsertest.mm @@ -21,10 +21,10 @@ #include "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "content/public/browser/devtools_manager.h" #include "content/public/test/test_utils.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm index 252f41b..3ba4616 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm @@ -9,8 +9,8 @@ #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h" #import "chrome/browser/ui/cocoa/extensions/extension_install_view_controller.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/in_process_browser_test.h" +#include "extensions/common/extension.h" using extensions::Extension; diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm index 0546625..9ecc729 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm @@ -9,7 +9,7 @@ #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" using extensions::Extension; diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm index d6495df..a0f499b 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm @@ -13,9 +13,9 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/bundle_installer.h" #import "chrome/browser/ui/chrome_style.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "content/public/browser/page_navigator.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "skia/ext/skia_utils_mac.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm index 47af4816..2c1b7ef 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm @@ -12,7 +12,7 @@ #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h" #import "chrome/browser/ui/cocoa/extensions/extension_install_view_controller.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm index bd089309..8035295 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm @@ -8,7 +8,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #import "chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "third_party/skia/include/core/SkBitmap.h" using extensions::BundleInstaller; diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm index d255753..6858e96 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm @@ -35,12 +35,12 @@ #include "chrome/common/extensions/api/commands/commands_handler.h" #include "chrome/common/extensions/api/extension_action/action_info.h" #include "chrome/common/extensions/api/omnibox/omnibox_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/sync_helper.h" #include "chrome/common/url_constants.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #import "skia/ext/skia_utils_mac.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm index 69373ad..1ae61bc 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller_unittest.mm @@ -18,11 +18,11 @@ #import "chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.h" #import "chrome/browser/ui/cocoa/info_bubble_window.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/testing_profile.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" -#include "third_party/ocmock/gtest_support.h" #import "third_party/ocmock/OCMock/OCMock.h" +#include "third_party/ocmock/gtest_support.h" #include "ui/gfx/codec/png_codec.h" using extensions::Extension; diff --git a/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm b/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm index 54b0d3d..2eb924c 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm @@ -8,9 +8,9 @@ #include "chrome/browser/extensions/api/commands/command_service.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/notification_service.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" namespace values = extensions::manifest_values; diff --git a/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm b/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm index 1e301e0..f7d9111 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm @@ -10,7 +10,7 @@ #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "skia/ext/skia_utils_mac.h" diff --git a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm index 5c3680f..b0943c7 100644 --- a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm +++ b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm @@ -8,11 +8,11 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_test_util.h" #include "chrome/test/base/in_process_browser_test.h" #include "components/web_modal/web_contents_modal_dialog_manager.h" #include "content/public/test/test_utils.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" using ::testing::NiceMock; diff --git a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm index 7c95e8e..b0b7063 100644 --- a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm @@ -7,8 +7,8 @@ #include "chrome/browser/media_galleries/media_galleries_dialog_controller_mock.h" #include "chrome/browser/storage_monitor/storage_info.h" #include "chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_test_util.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" using ::testing::_; diff --git a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm index e6632fd3..3c06ea9 100644 --- a/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm +++ b/chrome/browser/ui/cocoa/infobars/extension_infobar_controller.mm @@ -16,12 +16,12 @@ #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.h" #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h" #import "chrome/browser/ui/cocoa/menu_button.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index 26b5806..e97a749 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -34,8 +34,8 @@ #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h" #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h" #import "chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h" -#import "chrome/browser/ui/cocoa/location_bar/generated_credit_card_decoration.h" #import "chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h" +#import "chrome/browser/ui/cocoa/location_bar/generated_credit_card_decoration.h" #import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h" #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h" #import "chrome/browser/ui/cocoa/location_bar/mic_search_decoration.h" @@ -51,10 +51,10 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/zoom/zoom_controller.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_controller.mm index 54ba94a..edebcbd 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_controller.mm @@ -17,7 +17,7 @@ #import "chrome/browser/ui/cocoa/tabs/tab_controller_target.h" #import "chrome/browser/ui/cocoa/tabs/tab_view.h" #import "chrome/browser/ui/cocoa/themed_window.h" -#import "chrome/common/extensions/extension.h" +#import "extensions/common/extension.h" #include "grit/generated_resources.h" #import "third_party/GTM/AppKit/GTMFadeTruncatingTextFieldCell.h" #import "ui/base/cocoa/menu_controller.h" diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc index 5492c60..827214b 100644 --- a/chrome/browser/ui/extensions/application_launch.cc +++ b/chrome/browser/ui/extensions/application_launch.cc @@ -30,7 +30,6 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/url_constants.h" @@ -39,6 +38,7 @@ #include "content/public/browser/web_contents_view.h" #include "content/public/common/renderer_preferences.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/window_open_disposition.h" diff --git a/chrome/browser/ui/extensions/extension_install_ui_default.cc b/chrome/browser/ui/extensions/extension_install_ui_default.cc index 958f1ca..4635d35 100644 --- a/chrome/browser/ui/extensions/extension_install_ui_default.cc +++ b/chrome/browser/ui/extensions/extension_install_ui_default.cc @@ -31,11 +31,11 @@ #include "chrome/browser/ui/singleton_tabs.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/extensions/extension_installed_bubble.cc b/chrome/browser/ui/extensions/extension_installed_bubble.cc index 9c6ecdb..40715db 100644 --- a/chrome/browser/ui/extensions/extension_installed_bubble.cc +++ b/chrome/browser/ui/extensions/extension_installed_bubble.cc @@ -13,9 +13,9 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/extensions/api/extension_action/action_info.h" #include "chrome/common/extensions/api/omnibox/omnibox_handler.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" using content::Details; using extensions::Extension; diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller.cc b/chrome/browser/ui/fullscreen/fullscreen_controller.cc index b739e85..c84260c 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_controller.cc @@ -18,7 +18,6 @@ #include "chrome/browser/ui/status_bubble.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" @@ -26,6 +25,7 @@ #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #if defined(OS_MACOSX) #include "base/mac/mac_util.h" diff --git a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc index 9cd835d..0a107bd 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc @@ -6,10 +6,10 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/url_constants.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc b/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc index 56d4f5f..c76619e 100644 --- a/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc +++ b/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc @@ -14,11 +14,11 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/gtk_window_util.h" #include "chrome/browser/web_applications/web_app.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/common/extension.h" #include "ui/base/x/active_window_watcher_x.h" #include "ui/gfx/gtk_util.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc index 9bc0ab8..2924436 100644 --- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc +++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc @@ -38,9 +38,9 @@ #include "chrome/browser/ui/gtk/menu_gtk.h" #include "chrome/browser/ui/gtk/view_id_util.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc index b2e14a9..1c562c1 100644 --- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc @@ -20,11 +20,11 @@ #include "chrome/browser/ui/web_applications/web_app_ui.h" #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" #include "chrome/browser/web_applications/web_app.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc index f2c2055..bd9d3b1 100644 --- a/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/extension_install_dialog_gtk.cc @@ -13,11 +13,11 @@ #include "chrome/browser/ui/gtk/browser_window_gtk.h" #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" #include "chrome/browser/ui/gtk/gtk_util.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "content/public/browser/page_navigator.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "skia/ext/image_operations.h" #include "ui/base/gtk/gtk_hig_constants.h" diff --git a/chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc index 3a219b9..a00120b 100644 --- a/chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc @@ -22,10 +22,10 @@ #include "chrome/browser/ui/gtk/location_bar_view_gtk.h" #include "chrome/browser/ui/singleton_tabs.h" #include "chrome/common/extensions/api/omnibox/omnibox_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.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 4637dd0..10c7f5d 100644 --- a/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.cc @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/api/commands/command_service.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "ui/base/accelerators/platform_accelerator_gtk.h" // static diff --git a/chrome/browser/ui/gtk/extensions/extension_uninstall_dialog_gtk.cc b/chrome/browser/ui/gtk/extensions/extension_uninstall_dialog_gtk.cc index 9cd5f93..53129ab 100644 --- a/chrome/browser/ui/gtk/extensions/extension_uninstall_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/extensions/extension_uninstall_dialog_gtk.cc @@ -14,7 +14,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/gtk/browser_window_gtk.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "ui/base/gtk/gtk_hig_constants.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk_unittest.cc b/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk_unittest.cc index 0001944..74ba8c7 100644 --- a/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk_unittest.cc +++ b/chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk_unittest.cc @@ -7,8 +7,8 @@ #include "chrome/browser/media_galleries/media_galleries_dialog_controller_mock.h" #include "chrome/browser/storage_monitor/storage_info.h" #include "chrome/browser/ui/gtk/extensions/media_galleries_dialog_gtk.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_test_util.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" using ::testing::_; diff --git a/chrome/browser/ui/gtk/gtk_theme_service.cc b/chrome/browser/ui/gtk/gtk_theme_service.cc index a4d3562..5dfec94 100644 --- a/chrome/browser/ui/gtk/gtk_theme_service.cc +++ b/chrome/browser/ui/gtk/gtk_theme_service.cc @@ -28,11 +28,11 @@ #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/hover_controller_gtk.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/extension.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc b/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc index 0575aea..e9a3c5c 100644 --- a/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc +++ b/chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc @@ -14,12 +14,12 @@ #include "chrome/browser/ui/gtk/gtk_chrome_button.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/infobars/infobar_container_gtk.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "grit/theme_resources.h" #include "ui/base/gtk/gtk_signal_registrar.h" diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc index de07c0c..439150a 100644 --- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc @@ -72,12 +72,12 @@ #include "chrome/browser/ui/zoom/zoom_controller.h" #include "chrome/common/badge_util.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/pref_names.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc index 4457382..7a9308c 100644 --- a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc +++ b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc @@ -29,12 +29,12 @@ #include "chrome/browser/ui/gtk/menu_gtk.h" #include "chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h" #include "chrome/browser/ui/gtk/rounded_window.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/process_manager.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/gtk/gtk_hig_constants.h" diff --git a/chrome/browser/ui/gtk/script_bubble_gtk.cc b/chrome/browser/ui/gtk/script_bubble_gtk.cc index 6e05151..600f07b 100644 --- a/chrome/browser/ui/gtk/script_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/script_bubble_gtk.cc @@ -16,11 +16,11 @@ #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" diff --git a/chrome/browser/ui/panels/base_panel_browser_test.h b/chrome/browser/ui/panels/base_panel_browser_test.h index 79806a9..2953dd1 100644 --- a/chrome/browser/ui/panels/base_panel_browser_test.h +++ b/chrome/browser/ui/panels/base_panel_browser_test.h @@ -10,8 +10,8 @@ #include "chrome/browser/ui/panels/display_settings_provider.h" #include "chrome/browser/ui/panels/panel.h" #include "chrome/browser/ui/panels/panel_manager.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/in_process_browser_test.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/ui/panels/panel.cc b/chrome/browser/ui/panels/panel.cc index d213492..16b1013 100644 --- a/chrome/browser/ui/panels/panel.cc +++ b/chrome/browser/ui/panels/panel.cc @@ -29,7 +29,6 @@ #include "chrome/browser/ui/panels/panel_manager.h" #include "chrome/browser/ui/panels/stacked_panel_collection.h" #include "chrome/browser/web_applications/web_app.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" @@ -37,6 +36,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "ui/gfx/image/image.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/ui/panels/panel_extension_browsertest.cc b/chrome/browser/ui/panels/panel_extension_browsertest.cc index b63a8c8..cd5d975 100644 --- a/chrome/browser/ui/panels/panel_extension_browsertest.cc +++ b/chrome/browser/ui/panels/panel_extension_browsertest.cc @@ -19,10 +19,10 @@ #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_utils.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_MACOSX) diff --git a/chrome/browser/ui/panels/stacked_panel_collection.cc b/chrome/browser/ui/panels/stacked_panel_collection.cc index ff8563d..92e4aa6 100644 --- a/chrome/browser/ui/panels/stacked_panel_collection.cc +++ b/chrome/browser/ui/panels/stacked_panel_collection.cc @@ -14,7 +14,7 @@ #include "chrome/browser/ui/panels/panel.h" #include "chrome/browser/ui/panels/panel_constants.h" #include "chrome/browser/ui/panels/panel_manager.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" StackedPanelCollection::StackedPanelCollection(PanelManager* panel_manager) : PanelCollection(PanelCollection::STACKED), diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc index 4d5dcda..84e9aa6 100644 --- a/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc +++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc @@ -19,9 +19,9 @@ #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/sync_helper.h" +#include "extensions/common/extension.h" #include "ui/gfx/color_utils.h" #include "ui/native_theme/native_theme.h" diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc index 99056df..8dc335c 100644 --- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc +++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc @@ -27,13 +27,13 @@ #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/prefs/browser_prefs.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/test/base/testing_pref_service_syncable.h" #include "chrome/test/base/testing_profile.h" #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/test/test_browser_thread_bundle.h" #include "content/public/test/test_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/permission_set.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc b/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc index 0e55fa0..38e3fde 100644 --- a/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc +++ b/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc @@ -9,10 +9,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/sync/glue/synced_window_delegate.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #if defined(ENABLE_MANAGED_USERS) #include "chrome/browser/managed_mode/managed_mode_navigation_observer.h" diff --git a/chrome/browser/ui/tabs/pinned_tab_codec.cc b/chrome/browser/ui/tabs/pinned_tab_codec.cc index e1932d0..ebfd6aa 100644 --- a/chrome/browser/ui/tabs/pinned_tab_codec.cc +++ b/chrome/browser/ui/tabs/pinned_tab_codec.cc @@ -13,12 +13,12 @@ #include "chrome/browser/ui/browser_iterator.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/pref_names.h" #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" using content::NavigationEntry; diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc index 7adedcf..fd2481a 100644 --- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc @@ -24,7 +24,6 @@ #include "chrome/browser/ui/tabs/tab_strip_model_order_controller.h" #include "chrome/browser/ui/tabs/test_tab_strip_model_delegate.h" #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" @@ -34,6 +33,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" using content::SiteInstance; diff --git a/chrome/browser/ui/views/apps/native_app_window_views.cc b/chrome/browser/ui/views/apps/native_app_window_views.cc index cb090f5..12a4307 100644 --- a/chrome/browser/ui/views/apps/native_app_window_views.cc +++ b/chrome/browser/ui/views/apps/native_app_window_views.cc @@ -18,13 +18,13 @@ #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h" #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "extensions/common/draggable_region.h" +#include "extensions/common/extension.h" #include "ui/views/controls/webview/webview.h" #include "ui/views/widget/widget.h" #include "ui/views/window/non_client_view.h" diff --git a/chrome/browser/ui/views/apps/native_app_window_views_win.cc b/chrome/browser/ui/views/apps/native_app_window_views_win.cc index 27e99d4..b4d7f6e 100644 --- a/chrome/browser/ui/views/apps/native_app_window_views_win.cc +++ b/chrome/browser/ui/views/apps/native_app_window_views_win.cc @@ -9,7 +9,7 @@ #include "ash/shell.h" #include "chrome/browser/metro_utils/metro_chrome_win.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "ui/aura/remote_root_window_host_win.h" #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" diff --git a/chrome/browser/ui/views/browser_action_view.cc b/chrome/browser/ui/views/browser_action_view.cc index 75705c7..51e0598 100644 --- a/chrome/browser/ui/views/browser_action_view.cc +++ b/chrome/browser/ui/views/browser_action_view.cc @@ -16,7 +16,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/browser_actions_container.h" #include "chrome/browser/ui/views/toolbar_view.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index 1a6b51e..8e60a54 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -22,11 +22,11 @@ #include "chrome/browser/ui/web_applications/web_app_ui.h" #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc index ab32c44..3a2373a 100644 --- a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc +++ b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc @@ -14,7 +14,7 @@ #include "chrome/browser/ui/views/browser_action_view.h" #include "chrome/browser/ui/views/browser_actions_container.h" #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "ui/gfx/canvas.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_runner.h" diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc index 6968c55..7654bf5 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc @@ -15,11 +15,11 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/views/constrained_window_views.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/installer/util/browser_distribution.h" #include "content/public/browser/page_navigator.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/google_chrome_strings.h" diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc index 175a945..8a069b4 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble_view.cc @@ -27,9 +27,9 @@ #include "chrome/browser/ui/views/tabs/tab_strip.h" #include "chrome/browser/ui/views/toolbar_view.h" #include "chrome/common/extensions/api/omnibox/omnibox_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/sync_helper.h" #include "chrome/common/url_constants.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/ui_resources.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 61f4915..f0c941a 100644 --- a/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc +++ b/chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc @@ -8,7 +8,7 @@ #include "chrome/browser/extensions/extension_keybinding_registry.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "ui/views/focus/focus_manager.h" // static diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc index c51023a..e0d9354 100644 --- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc @@ -12,7 +12,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/views/constrained_window_views.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/compositor/compositor.h" diff --git a/chrome/browser/ui/views/infobars/extension_infobar.cc b/chrome/browser/ui/views/infobars/extension_infobar.cc index 7889848..d0b9d67 100644 --- a/chrome/browser/ui/views/infobars/extension_infobar.cc +++ b/chrome/browser/ui/views/infobars/extension_infobar.cc @@ -10,10 +10,10 @@ #include "chrome/browser/extensions/image_loader.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/ui/views/frame/browser_view.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "grit/theme_resources.h" #include "ui/base/resource/resource_bundle.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 7db6296..28c8d3e 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 @@ -21,7 +21,7 @@ #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/browser/ui/webui/extensions/extension_info_ui.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/events/event.h" #include "ui/gfx/canvas.h" diff --git a/chrome/browser/ui/views/script_bubble_view.cc b/chrome/browser/ui/views/script_bubble_view.cc index 28ce024..cb472cb 100644 --- a/chrome/browser/ui/views/script_bubble_view.cc +++ b/chrome/browser/ui/views/script_bubble_view.cc @@ -11,11 +11,11 @@ #include "chrome/browser/extensions/script_bubble_controller.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/url_constants.h" #include "content/public/browser/page_navigator.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/web_applications/web_app_ui.cc b/chrome/browser/ui/web_applications/web_app_ui.cc index 2e7b6c4..86d641a 100644 --- a/chrome/browser/ui/web_applications/web_app_ui.cc +++ b/chrome/browser/ui/web_applications/web_app_ui.cc @@ -18,7 +18,6 @@ #include "chrome/browser/history/select_favicon_frames.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/web_applications/web_app.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/pref_names.h" @@ -27,6 +26,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" +#include "extensions/common/extension.h" #include "grit/theme_resources.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/ui/webui/app_list/start_page_handler.cc b/chrome/browser/ui/webui/app_list/start_page_handler.cc index d352af8..3c0c354 100644 --- a/chrome/browser/ui/webui/app_list/start_page_handler.cc +++ b/chrome/browser/ui/webui/app_list/start_page_handler.cc @@ -18,10 +18,10 @@ #include "chrome/browser/ui/app_list/start_page_service.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" #include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui.h" +#include "extensions/common/extension.h" #include "ui/events/event_constants.h" namespace app_list { diff --git a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc index 8eb1838..39ae6a2 100644 --- a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc +++ b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc @@ -16,12 +16,12 @@ #include "base/values.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/settings/cros_settings.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chromeos/chromeos_switches.h" #include "chromeos/settings/cros_settings_names.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/extensions/extension_basic_info.cc b/chrome/browser/ui/webui/extensions/extension_basic_info.cc index 0e6b3e5..d28740c 100644 --- a/chrome/browser/ui/webui/extensions/extension_basic_info.cc +++ b/chrome/browser/ui/webui/extensions/extension_basic_info.cc @@ -5,10 +5,10 @@ #include "chrome/browser/ui/webui/extensions/extension_basic_info.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/kiosk_mode_info.h" #include "chrome/common/extensions/manifest_handlers/offline_enabled_info.h" #include "chrome/common/extensions/manifest_url_handler.h" +#include "extensions/common/extension.h" namespace { diff --git a/chrome/browser/ui/webui/extensions/extension_error_handler.cc b/chrome/browser/ui/webui/extensions/extension_error_handler.cc index e99eec1..03da966 100644 --- a/chrome/browser/ui/webui/extensions/extension_error_handler.cc +++ b/chrome/browser/ui/webui/extensions/extension_error_handler.cc @@ -18,7 +18,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" @@ -27,6 +26,7 @@ #include "extensions/browser/extension_error.h" #include "extensions/browser/file_highlighter.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc index 591edac..92ec916 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc @@ -19,11 +19,11 @@ #include "chrome/browser/extensions/image_loader.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/url_constants.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "grit/component_extension_resources_map.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/webui/extensions/extension_info_ui.cc b/chrome/browser/ui/webui/extensions/extension_info_ui.cc index 3714df1..163db8e 100644 --- a/chrome/browser/ui/webui/extensions/extension_info_ui.cc +++ b/chrome/browser/ui/webui/extensions/extension_info_ui.cc @@ -14,12 +14,12 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/extensions/extension_basic_info.h" #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" +#include "extensions/common/extension.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h index 14edcd5..dcbead3 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h +++ b/chrome/browser/ui/webui/extensions/extension_settings_browsertest.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_UI_WEBUI_EXTENSIONS_EXTENSION_SETTINGS_BROWSERTEST_H_ #include "chrome/browser/extensions/extension_test_notification_observer.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/web_ui_browsertest.h" +#include "extensions/common/extension.h" class Profile; diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc index 2347259..1aef5e2 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc @@ -53,7 +53,6 @@ #include "chrome/browser/ui/webui/extensions/extension_basic_info.h" #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/extension_set.h" @@ -76,6 +75,7 @@ #include "extensions/browser/lazy_background_task_queue.h" #include "extensions/browser/view_type_utils.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/manifest_handlers/incognito_info.h" diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc index 7e02cf0..aa33c08 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc @@ -38,7 +38,6 @@ #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" @@ -50,6 +49,7 @@ #include "content/public/browser/web_ui.h" #include "content/public/common/favicon_url.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.h b/chrome/browser/ui/webui/ntp/app_launcher_handler.h index 1cc91fc..411779a 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.h +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.h @@ -15,11 +15,11 @@ #include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h" #include "chrome/common/cancelable_task_tracker.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_ui_message_handler.h" +#include "extensions/common/extension.h" #include "sync/api/string_ordinal.h" class ExtensionEnableFlow; diff --git a/chrome/browser/ui/webui/ntp/core_app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/core_app_launcher_handler.cc index cdef973..ee92446 100644 --- a/chrome/browser/ui/webui/ntp/core_app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/core_app_launcher_handler.cc @@ -9,10 +9,10 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/web_ui.h" +#include "extensions/common/extension.h" #include "net/base/escape.h" namespace { diff --git a/chrome/browser/ui/webui/ntp/core_app_launcher_handler.h b/chrome/browser/ui/webui/ntp/core_app_launcher_handler.h index c19f1f0..8bec491 100644 --- a/chrome/browser/ui/webui/ntp/core_app_launcher_handler.h +++ b/chrome/browser/ui/webui/ntp/core_app_launcher_handler.h @@ -10,9 +10,9 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "content/public/browser/web_ui_message_handler.h" +#include "extensions/common/extension.h" namespace extensions { class Extension; diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index c472797..a62fe18 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -36,13 +36,13 @@ #include "chrome/browser/ui/webui/sync_setup_handler.h" #include "chrome/browser/web_resource/notification_promo.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" +#include "extensions/common/extension.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc index 833f074..ebc8bcd 100644 --- a/chrome/browser/ui/webui/options/core_options_handler.cc +++ b/chrome/browser/ui/webui/options/core_options_handler.cc @@ -20,7 +20,6 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/options/options_util.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/net/url_fixer_upper.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" @@ -28,6 +27,7 @@ #include "content/public/browser/notification_types.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_ui.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/webui/options/font_settings_handler.cc b/chrome/browser/ui/webui/options/font_settings_handler.cc index 8ba7b7a..c0de39a 100644 --- a/chrome/browser/ui/webui/options/font_settings_handler.cc +++ b/chrome/browser/ui/webui/options/font_settings_handler.cc @@ -24,12 +24,12 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/webui/options/font_settings_utils.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "content/public/browser/font_list_async.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_ui.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc index 4887953..e0d67c0 100644 --- a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc +++ b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc @@ -16,10 +16,10 @@ #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" #include "chrome/browser/ui/search_engines/template_url_table_model.h" #include "chrome/common/extensions/api/omnibox/omnibox_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_ui.h" +#include "extensions/common/extension.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/policy_ui.cc b/chrome/browser/ui/webui/policy_ui.cc index d343f15..f6f1bf6 100644 --- a/chrome/browser/ui/webui/policy_ui.cc +++ b/chrome/browser/ui/webui/policy_ui.cc @@ -68,8 +68,8 @@ #if !defined(OS_ANDROID) && !defined(OS_IOS) #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #endif diff --git a/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc b/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc index 8147810..5456172 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc +++ b/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc @@ -14,9 +14,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync_file_system/sync_file_system_service.h" #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" +#include "extensions/common/extension.h" #include "grit/sync_file_system_internals_resources.h" using sync_file_system::SyncFileSystemServiceFactory; diff --git a/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.cc b/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.cc index 9cefc36..b3487a7 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.cc +++ b/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.cc @@ -14,9 +14,9 @@ #include "chrome/browser/sync_file_system/sync_file_system_service.h" #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h" #include "chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" +#include "extensions/common/extension.h" #include "grit/sync_file_system_internals_resources.h" using sync_file_system::RemoteFileSyncService; diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc index 072bbf0..a807b51 100644 --- a/chrome/browser/web_applications/web_app.cc +++ b/chrome/browser/web_applications/web_app.cc @@ -13,11 +13,11 @@ #include "base/threading/thread.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/web_applications/web_app_mac.mm b/chrome/browser/web_applications/web_app_mac.mm index 40ebc27..da753c2 100644 --- a/chrome/browser/web_applications/web_app_mac.mm +++ b/chrome/browser/web_applications/web_app_mac.mm @@ -18,9 +18,9 @@ #include "base/mac/scoped_cftyperef.h" #include "base/path_service.h" #include "base/process/process_handle.h" +#include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" -#include "base/strings/string16.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #import "chrome/browser/mac/dock.h" @@ -30,9 +30,9 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/extension.h" #import "chrome/common/mac/app_mode_common.h" #include "content/public/browser/browser_thread.h" +#include "extensions/common/extension.h" #include "grit/chromium_strings.h" #import "skia/ext/skia_utils_mac.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 1f0f67f..0530a8d 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -172,8 +172,6 @@ 'common/extensions/csp_validator.cc', 'common/extensions/csp_validator.h', 'common/extensions/dom_action_types.h', - 'common/extensions/extension.cc', - 'common/extensions/extension.h', 'common/extensions/extension_constants.cc', 'common/extensions/extension_constants.h', 'common/extensions/extension_file_util.cc', @@ -252,8 +250,6 @@ 'common/extensions/permissions/media_galleries_permission_data.h', 'common/extensions/permissions/permission_message_util.cc', 'common/extensions/permissions/permission_message_util.h', - 'common/extensions/permissions/permissions_data.cc', - 'common/extensions/permissions/permissions_data.h', 'common/extensions/permissions/set_disjunction_permission.h', 'common/extensions/permissions/settings_override_permission.cc', 'common/extensions/permissions/settings_override_permission.h', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index b648e4c..2c82edb 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -541,6 +541,7 @@ '../extensions/common/one_shot_event_unittest.cc', '../extensions/common/permissions/api_permission_set_unittest.cc', '../extensions/common/permissions/manifest_permission_set_unittest.cc', + '../extensions/common/permissions/permissions_data_unittest.cc', '../extensions/common/url_pattern_set_unittest.cc', '../extensions/common/url_pattern_unittest.cc', '../extensions/common/user_script_unittest.cc', @@ -1852,7 +1853,6 @@ 'common/extensions/message_bundle_unittest.cc', 'common/extensions/permissions/media_galleries_permission_unittest.cc', 'common/extensions/permissions/permission_set_unittest.cc', - 'common/extensions/permissions/permissions_data_unittest.cc', 'common/extensions/permissions/settings_override_permission_unittest.cc', 'common/extensions/permissions/socket_permission_unittest.cc', 'common/extensions/permissions/usb_device_permission_unittest.cc', diff --git a/chrome/common/extensions/api/commands/commands_handler.h b/chrome/common/extensions/api/commands/commands_handler.h index f4eb609..ca75764 100644 --- a/chrome/common/extensions/api/commands/commands_handler.h +++ b/chrome/common/extensions/api/commands/commands_handler.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/common/extensions/command.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_handler.h" diff --git a/chrome/common/extensions/api/extension_action/action_info.cc b/chrome/common/extensions/api/extension_action/action_info.cc index 423e33f..715af4d 100644 --- a/chrome/common/extensions/api/extension_action/action_info.cc +++ b/chrome/common/extensions/api/extension_action/action_info.cc @@ -7,10 +7,10 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/extensions/api/commands/commands_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_handler_helpers.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" namespace extensions { diff --git a/chrome/common/extensions/api/extension_action/action_info.h b/chrome/common/extensions/api/extension_action/action_info.h index fc34528..c1f0714 100644 --- a/chrome/common/extensions/api/extension_action/action_info.h +++ b/chrome/common/extensions/api/extension_action/action_info.h @@ -8,8 +8,8 @@ #include <string> #include "base/strings/string16.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" +#include "extensions/common/extension.h" #include "url/gurl.h" namespace base { diff --git a/chrome/common/extensions/api/extension_action/browser_action_handler.cc b/chrome/common/extensions/api/extension_action/browser_action_handler.cc index 5090a44..f877554 100644 --- a/chrome/common/extensions/api/extension_action/browser_action_handler.cc +++ b/chrome/common/extensions/api/extension_action/browser_action_handler.cc @@ -7,9 +7,9 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_file_util.h" +#include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" diff --git a/chrome/common/extensions/api/extension_action/browser_action_handler.h b/chrome/common/extensions/api/extension_action/browser_action_handler.h index 2a5ce42..4d1122f 100644 --- a/chrome/common/extensions/api/extension_action/browser_action_handler.h +++ b/chrome/common/extensions/api/extension_action/browser_action_handler.h @@ -8,7 +8,7 @@ #include <string> #include "chrome/common/extensions/api/extension_action/action_info.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/chrome/common/extensions/api/extension_action/page_action_handler.cc b/chrome/common/extensions/api/extension_action/page_action_handler.cc index 5d814e1..d607afa 100644 --- a/chrome/common/extensions/api/extension_action/page_action_handler.cc +++ b/chrome/common/extensions/api/extension_action/page_action_handler.cc @@ -6,9 +6,9 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_file_util.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "grit/generated_resources.h" diff --git a/chrome/common/extensions/api/extension_action/page_action_handler.h b/chrome/common/extensions/api/extension_action/page_action_handler.h index fadf243..bd8fd67 100644 --- a/chrome/common/extensions/api/extension_action/page_action_handler.h +++ b/chrome/common/extensions/api/extension_action/page_action_handler.h @@ -8,7 +8,7 @@ #include <string> #include "chrome/common/extensions/api/extension_action/action_info.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc b/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc index 993e1d0..22bfa18 100644 --- a/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc +++ b/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "chrome/common/extensions/api/extension_action/action_info.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/api/extension_action/script_badge_handler.cc b/chrome/common/extensions/api/extension_action/script_badge_handler.cc index 36ca6ab..519d6db 100644 --- a/chrome/common/extensions/api/extension_action/script_badge_handler.cc +++ b/chrome/common/extensions/api/extension_action/script_badge_handler.cc @@ -7,9 +7,9 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" +#include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" #include "extensions/common/install_warning.h" #include "extensions/common/manifest.h" diff --git a/chrome/common/extensions/api/extension_action/script_badge_handler.h b/chrome/common/extensions/api/extension_action/script_badge_handler.h index 1969dd3..5f2efb3 100644 --- a/chrome/common/extensions/api/extension_action/script_badge_handler.h +++ b/chrome/common/extensions/api/extension_action/script_badge_handler.h @@ -8,7 +8,7 @@ #include <string> #include "chrome/common/extensions/api/extension_action/action_info.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/chrome/common/extensions/api/extension_api_unittest.cc b/chrome/common/extensions/api/extension_api_unittest.cc index 32ab0af..b706f13 100644 --- a/chrome/common/extensions/api/extension_api_unittest.cc +++ b/chrome/common/extensions/api/extension_api_unittest.cc @@ -17,11 +17,11 @@ #include "base/strings/stringprintf.h" #include "base/values.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_test_util.h" #include "chrome/common/extensions/features/api_feature.h" #include "chrome/common/extensions/features/base_feature_provider.h" #include "chrome/common/extensions/features/simple_feature.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" diff --git a/chrome/common/extensions/api/file_browser_handlers/file_browser_handler.h b/chrome/common/extensions/api/file_browser_handlers/file_browser_handler.h index da69a6e..faf8b82 100644 --- a/chrome/common/extensions/api/file_browser_handlers/file_browser_handler.h +++ b/chrome/common/extensions/api/file_browser_handlers/file_browser_handler.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" #include "extensions/common/url_pattern.h" #include "extensions/common/url_pattern_set.h" diff --git a/chrome/common/extensions/api/file_handlers/file_handlers_parser.h b/chrome/common/extensions/api/file_handlers/file_handlers_parser.h index 0e3da7b..82bbac5 100644 --- a/chrome/common/extensions/api/file_handlers/file_handlers_parser.h +++ b/chrome/common/extensions/api/file_handlers/file_handlers_parser.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/chrome/common/extensions/api/i18n/default_locale_handler.h b/chrome/common/extensions/api/i18n/default_locale_handler.h index cf73b80..e59730b 100644 --- a/chrome/common/extensions/api/i18n/default_locale_handler.h +++ b/chrome/common/extensions/api/i18n/default_locale_handler.h @@ -7,7 +7,7 @@ #include <string> -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/chrome/common/extensions/api/identity/oauth2_manifest_handler.h b/chrome/common/extensions/api/identity/oauth2_manifest_handler.h index fd276db..5095de8 100644 --- a/chrome/common/extensions/api/identity/oauth2_manifest_handler.h +++ b/chrome/common/extensions/api/identity/oauth2_manifest_handler.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/chrome/common/extensions/api/input_ime/input_components_handler.cc b/chrome/common/extensions/api/input_ime/input_components_handler.cc index f7bfd79..3efbbf0 100644 --- a/chrome/common/extensions/api/input_ime/input_components_handler.cc +++ b/chrome/common/extensions/api/input_ime/input_components_handler.cc @@ -9,9 +9,9 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" diff --git a/chrome/common/extensions/api/input_ime/input_components_handler.h b/chrome/common/extensions/api/input_ime/input_components_handler.h index 3cff8e9..ea28ab9 100644 --- a/chrome/common/extensions/api/input_ime/input_components_handler.h +++ b/chrome/common/extensions/api/input_ime/input_components_handler.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" #include "url/gurl.h" diff --git a/chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h b/chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h index 740016a..f02b37d 100644 --- a/chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h +++ b/chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h @@ -9,7 +9,7 @@ #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_handler.h" diff --git a/chrome/common/extensions/api/media_galleries_private/media_galleries_handler.h b/chrome/common/extensions/api/media_galleries_private/media_galleries_handler.h index d8a2545..7614f86 100644 --- a/chrome/common/extensions/api/media_galleries_private/media_galleries_handler.h +++ b/chrome/common/extensions/api/media_galleries_private/media_galleries_handler.h @@ -10,7 +10,7 @@ #include <vector> #include "base/basictypes.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" class URLPattern; diff --git a/chrome/common/extensions/api/omnibox/omnibox_handler.cc b/chrome/common/extensions/api/omnibox/omnibox_handler.cc index 3f24bfe..aec2d7a 100644 --- a/chrome/common/extensions/api/omnibox/omnibox_handler.cc +++ b/chrome/common/extensions/api/omnibox/omnibox_handler.cc @@ -8,7 +8,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" diff --git a/chrome/common/extensions/api/omnibox/omnibox_handler.h b/chrome/common/extensions/api/omnibox/omnibox_handler.h index 50fd24d..681f01d 100644 --- a/chrome/common/extensions/api/omnibox/omnibox_handler.h +++ b/chrome/common/extensions/api/omnibox/omnibox_handler.h @@ -7,7 +7,7 @@ #include <string> -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/chrome/common/extensions/api/plugins/plugins_handler.cc b/chrome/common/extensions/api/plugins/plugins_handler.cc index 1f1ea6d..2b0f67a 100644 --- a/chrome/common/extensions/api/plugins/plugins_handler.cc +++ b/chrome/common/extensions/api/plugins/plugins_handler.cc @@ -8,12 +8,12 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "extensions/common/error_utils.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/api_permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/api/plugins/plugins_handler.h b/chrome/common/extensions/api/plugins/plugins_handler.h index 2315412..3f58f5a 100644 --- a/chrome/common/extensions/api/plugins/plugins_handler.h +++ b/chrome/common/extensions/api/plugins/plugins_handler.h @@ -8,7 +8,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/chrome/common/extensions/api/sockets/sockets_manifest_data.h b/chrome/common/extensions/api/sockets/sockets_manifest_data.h index b220617..d284497 100644 --- a/chrome/common/extensions/api/sockets/sockets_manifest_data.h +++ b/chrome/common/extensions/api/sockets/sockets_manifest_data.h @@ -8,7 +8,7 @@ #include <vector> #include "base/strings/string16.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace content { diff --git a/chrome/common/extensions/api/sockets/sockets_manifest_handler.cc b/chrome/common/extensions/api/sockets/sockets_manifest_handler.cc index 2e57ddc..c1ba23f 100644 --- a/chrome/common/extensions/api/sockets/sockets_manifest_handler.cc +++ b/chrome/common/extensions/api/sockets/sockets_manifest_handler.cc @@ -6,7 +6,7 @@ #include "chrome/common/extensions/api/sockets/sockets_manifest_data.h" #include "chrome/common/extensions/api/sockets/sockets_manifest_permission.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" namespace extensions { diff --git a/chrome/common/extensions/api/speech/tts_engine_manifest_handler.h b/chrome/common/extensions/api/speech/tts_engine_manifest_handler.h index 42d8fee..e9640c5 100644 --- a/chrome/common/extensions/api/speech/tts_engine_manifest_handler.h +++ b/chrome/common/extensions/api/speech/tts_engine_manifest_handler.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/chrome/common/extensions/api/spellcheck/spellcheck_handler.h b/chrome/common/extensions/api/spellcheck/spellcheck_handler.h index 3e37d92..466acfb 100644 --- a/chrome/common/extensions/api/spellcheck/spellcheck_handler.h +++ b/chrome/common/extensions/api/spellcheck/spellcheck_handler.h @@ -5,7 +5,7 @@ #ifndef CHROME_COMMON_EXTENSIONS_API_SPELLCHECK_SPELLCHECK_HANDLER_H_ #define CHROME_COMMON_EXTENSIONS_API_SPELLCHECK_SPELLCHECK_HANDLER_H_ -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/chrome/common/extensions/api/storage/storage_schema_manifest_handler.cc b/chrome/common/extensions/api/storage/storage_schema_manifest_handler.cc index 99d6bbf..87c5a812 100644 --- a/chrome/common/extensions/api/storage/storage_schema_manifest_handler.cc +++ b/chrome/common/extensions/api/storage/storage_schema_manifest_handler.cc @@ -13,7 +13,7 @@ #include "base/strings/string16.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/install_warning.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" diff --git a/chrome/common/extensions/api/storage/storage_schema_manifest_handler_unittest.cc b/chrome/common/extensions/api/storage/storage_schema_manifest_handler_unittest.cc index de62e0d..10300f3 100644 --- a/chrome/common/extensions/api/storage/storage_schema_manifest_handler_unittest.cc +++ b/chrome/common/extensions/api/storage/storage_schema_manifest_handler_unittest.cc @@ -12,9 +12,9 @@ #include "base/files/scoped_temp_dir.h" #include "base/values.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/features/feature_channel.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/api/system_indicator/system_indicator_handler.cc b/chrome/common/extensions/api/system_indicator/system_indicator_handler.cc index 451bd12..d13b94d 100644 --- a/chrome/common/extensions/api/system_indicator/system_indicator_handler.cc +++ b/chrome/common/extensions/api/system_indicator/system_indicator_handler.cc @@ -8,10 +8,10 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/extensions/api/extension_action/action_info.h" -#include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/permissions_data.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/api_permission_set.h" +#include "extensions/common/permissions/permissions_data.h" namespace extensions { diff --git a/chrome/common/extensions/api/system_indicator/system_indicator_handler.h b/chrome/common/extensions/api/system_indicator/system_indicator_handler.h index 65d3719..050ecfe 100644 --- a/chrome/common/extensions/api/system_indicator/system_indicator_handler.h +++ b/chrome/common/extensions/api/system_indicator/system_indicator_handler.h @@ -6,7 +6,7 @@ #define CHROME_COMMON_EXTENSIONS_API_SYSTEM_INDICATOR_SYSTEM_INDICATOR_HANDLER_H_ #include "base/strings/string16.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/chrome/common/extensions/api/url_handlers/url_handlers_parser.h b/chrome/common/extensions/api/url_handlers/url_handlers_parser.h index a2eb8f9..98ffec4 100644 --- a/chrome/common/extensions/api/url_handlers/url_handlers_parser.h +++ b/chrome/common/extensions/api/url_handlers/url_handlers_parser.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" #include "extensions/common/url_pattern.h" diff --git a/chrome/common/extensions/chrome_extensions_client.cc b/chrome/common/extensions/chrome_extensions_client.cc index a05e727..d2ece73 100644 --- a/chrome/common/extensions/chrome_extensions_client.cc +++ b/chrome/common/extensions/chrome_extensions_client.cc @@ -6,11 +6,11 @@ #include "base/command_line.h" #include "chrome/common/extensions/chrome_manifest_handlers.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/features/base_feature_provider.h" #include "chrome/common/url_constants.h" #include "content/public/common/url_constants.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/api_permission_set.h" #include "extensions/common/permissions/permission_message.h" diff --git a/chrome/common/extensions/command.cc b/chrome/common/extensions/command.cc index 01c90c0..7593974 100644 --- a/chrome/common/extensions/command.cc +++ b/chrome/common/extensions/command.cc @@ -10,8 +10,8 @@ #include "base/strings/string_util.h" #include "base/values.h" #include "chrome/common/chrome_version_info.h" // TODO(finnur): Remove. -#include "chrome/common/extensions/extension.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" #include "extensions/common/manifest_constants.h" #include "grit/generated_resources.h" diff --git a/chrome/common/extensions/csp_handler.h b/chrome/common/extensions/csp_handler.h index 19f37e9..9e79f9d 100644 --- a/chrome/common/extensions/csp_handler.h +++ b/chrome/common/extensions/csp_handler.h @@ -7,7 +7,7 @@ #include <string> -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc index fd882cf..1e41ea4 100644 --- a/chrome/common/extensions/extension_file_util.cc +++ b/chrome/common/extensions/extension_file_util.cc @@ -20,7 +20,6 @@ #include "base/threading/thread_restrictions.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/api/extension_action/action_info.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/extension_messages.h" @@ -28,6 +27,7 @@ #include "chrome/common/extensions/manifest_handlers/theme_handler.h" #include "chrome/common/extensions/message_bundle.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "extensions/common/install_warning.h" #include "extensions/common/manifest.h" diff --git a/chrome/common/extensions/extension_file_util_unittest.cc b/chrome/common/extensions/extension_file_util_unittest.cc index 143c5be..f767f24 100644 --- a/chrome/common/extensions/extension_file_util_unittest.cc +++ b/chrome/common/extensions/extension_file_util_unittest.cc @@ -11,8 +11,8 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #include "grit/generated_resources.h" diff --git a/chrome/common/extensions/extension_messages.cc b/chrome/common/extensions/extension_messages.cc index a8acbf8..978acb2 100644 --- a/chrome/common/extensions/extension_messages.cc +++ b/chrome/common/extensions/extension_messages.cc @@ -4,12 +4,12 @@ #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "content/public/common/common_param_traits.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_handler.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/permissions/permissions_info.h" using extensions::APIPermission; diff --git a/chrome/common/extensions/extension_messages.h b/chrome/common/extensions/extension_messages.h index f7f6a09..bd0453b 100644 --- a/chrome/common/extensions/extension_messages.h +++ b/chrome/common/extensions/extension_messages.h @@ -11,7 +11,6 @@ #include "base/memory/shared_memory.h" #include "base/values.h" #include "chrome/common/extensions/api/messaging/message.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/permissions/bluetooth_permission_data.h" #include "chrome/common/extensions/permissions/media_galleries_permission_data.h" #include "chrome/common/extensions/permissions/socket_permission_data.h" @@ -20,6 +19,7 @@ #include "content/public/common/common_param_traits.h" #include "content/public/common/socket_permission_request.h" #include "extensions/common/draggable_region.h" +#include "extensions/common/extension.h" #include "extensions/common/extensions_client.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/url_pattern.h" diff --git a/chrome/common/extensions/extension_process_policy.cc b/chrome/common/extensions/extension_process_policy.cc index 1008711..962a4f5 100644 --- a/chrome/common/extensions/extension_process_policy.cc +++ b/chrome/common/extensions/extension_process_policy.cc @@ -4,10 +4,10 @@ #include "chrome/common/extensions/extension_process_policy.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" +#include "extensions/common/extension.h" namespace extensions { diff --git a/chrome/common/extensions/extension_set.cc b/chrome/common/extensions/extension_set.cc index 33d9abc..483d4b1 100644 --- a/chrome/common/extensions/extension_set.cc +++ b/chrome/common/extensions/extension_set.cc @@ -7,10 +7,10 @@ #include "base/callback.h" #include "base/logging.h" #include "base/stl_util.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/sandboxed_page_info.h" #include "chrome/common/url_constants.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" using extensions::Extension; diff --git a/chrome/common/extensions/extension_set.h b/chrome/common/extensions/extension_set.h index 7dc3ea0..f7d7b23 100644 --- a/chrome/common/extensions/extension_set.h +++ b/chrome/common/extensions/extension_set.h @@ -12,7 +12,7 @@ #include "base/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "url/gurl.h" // The one true extension container. Extensions are identified by their id. diff --git a/chrome/common/extensions/extension_set_unittest.cc b/chrome/common/extensions/extension_set_unittest.cc index 84a9ae3..2be19ca 100644 --- a/chrome/common/extensions/extension_set_unittest.cc +++ b/chrome/common/extensions/extension_set_unittest.cc @@ -7,8 +7,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" using extensions::Extension; diff --git a/chrome/common/extensions/extension_test_util.cc b/chrome/common/extensions/extension_test_util.cc index 2af3e0a..dd1215b8 100644 --- a/chrome/common/extensions/extension_test_util.cc +++ b/chrome/common/extensions/extension_test_util.cc @@ -9,7 +9,7 @@ #include "base/path_service.h" #include "base/values.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc index 918f32b..f0c2c8c 100644 --- a/chrome/common/extensions/extension_unittest.cc +++ b/chrome/common/extensions/extension_unittest.cc @@ -9,14 +9,14 @@ #include "base/strings/stringprintf.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/command.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/extension_test_util.h" #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/url_constants.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "extensions/common/manifest.h" +#include "extensions/common/permissions/permissions_data.h" #include "net/base/mime_sniffer.h" #include "net/dns/mock_host_resolver.h" #include "skia/ext/image_operations.h" diff --git a/chrome/common/extensions/features/complex_feature.h b/chrome/common/extensions/features/complex_feature.h index 45cf6a2..b434b4e 100644 --- a/chrome/common/extensions/features/complex_feature.h +++ b/chrome/common/extensions/features/complex_feature.h @@ -8,7 +8,7 @@ #include <string> #include "base/memory/scoped_vector.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/features/feature.h" #include "extensions/common/manifest.h" diff --git a/chrome/common/extensions/features/permission_feature.cc b/chrome/common/extensions/features/permission_feature.cc index cc91c41..c4477aa 100644 --- a/chrome/common/extensions/features/permission_feature.cc +++ b/chrome/common/extensions/features/permission_feature.cc @@ -4,8 +4,8 @@ #include "chrome/common/extensions/features/permission_feature.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "extensions/common/permissions/permission_set.h" +#include "extensions/common/permissions/permissions_data.h" namespace extensions { diff --git a/chrome/common/extensions/features/simple_feature.h b/chrome/common/extensions/features/simple_feature.h index aa6be16..b3716b7 100644 --- a/chrome/common/extensions/features/simple_feature.h +++ b/chrome/common/extensions/features/simple_feature.h @@ -11,7 +11,7 @@ #include "base/gtest_prod_util.h" #include "base/values.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/features/feature.h" #include "extensions/common/manifest.h" diff --git a/chrome/common/extensions/manifest_handler_helpers.cc b/chrome/common/extensions/manifest_handler_helpers.cc index 63bb78c..1e66fe4 100644 --- a/chrome/common/extensions/manifest_handler_helpers.cc +++ b/chrome/common/extensions/manifest_handler_helpers.cc @@ -8,9 +8,9 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" diff --git a/chrome/common/extensions/manifest_handlers/app_isolation_info.cc b/chrome/common/extensions/manifest_handlers/app_isolation_info.cc index 7798eac..2d2d2c6 100644 --- a/chrome/common/extensions/manifest_handlers/app_isolation_info.cc +++ b/chrome/common/extensions/manifest_handlers/app_isolation_info.cc @@ -9,10 +9,10 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "extensions/common/error_utils.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/api_permission_set.h" +#include "extensions/common/permissions/permissions_data.h" namespace extensions { diff --git a/chrome/common/extensions/manifest_handlers/app_isolation_info.h b/chrome/common/extensions/manifest_handlers/app_isolation_info.h index f43929f..c74ed9d 100644 --- a/chrome/common/extensions/manifest_handlers/app_isolation_info.h +++ b/chrome/common/extensions/manifest_handlers/app_isolation_info.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_handler.h" diff --git a/chrome/common/extensions/manifest_handlers/app_launch_info.h b/chrome/common/extensions/manifest_handlers/app_launch_info.h index f2357bf..8cb28fb 100644 --- a/chrome/common/extensions/manifest_handlers/app_launch_info.h +++ b/chrome/common/extensions/manifest_handlers/app_launch_info.h @@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "chrome/common/extensions/extension.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_handler.h" #include "url/gurl.h" diff --git a/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc b/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc index 9ce42a4..6e48e82 100644 --- a/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc +++ b/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc @@ -11,12 +11,12 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "content/public/common/url_constants.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/url_pattern.h" #include "extensions/common/url_pattern_set.h" #include "grit/generated_resources.h" diff --git a/chrome/common/extensions/manifest_handlers/content_scripts_handler.h b/chrome/common/extensions/manifest_handlers/content_scripts_handler.h index 389c7ee..5b48c27 100644 --- a/chrome/common/extensions/manifest_handlers/content_scripts_handler.h +++ b/chrome/common/extensions/manifest_handlers/content_scripts_handler.h @@ -7,7 +7,7 @@ #include <string> -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" #include "extensions/common/user_script.h" diff --git a/chrome/common/extensions/manifest_handlers/content_scripts_manifest_unittest.cc b/chrome/common/extensions/manifest_handlers/content_scripts_manifest_unittest.cc index bb40549..fd05f38 100644 --- a/chrome/common/extensions/manifest_handlers/content_scripts_manifest_unittest.cc +++ b/chrome/common/extensions/manifest_handlers/content_scripts_manifest_unittest.cc @@ -4,10 +4,10 @@ #include "base/command_line.h" #include "base/strings/string_number_conversions.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/switches.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/manifest_handlers/exclude_matches_manifest_unittest.cc b/chrome/common/extensions/manifest_handlers/exclude_matches_manifest_unittest.cc index b17040e..ef0cd0d 100644 --- a/chrome/common/extensions/manifest_handlers/exclude_matches_manifest_unittest.cc +++ b/chrome/common/extensions/manifest_handlers/exclude_matches_manifest_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" namespace extensions { diff --git a/chrome/common/extensions/manifest_handlers/externally_connectable.cc b/chrome/common/extensions/manifest_handlers/externally_connectable.cc index 8d06248..7be1d23 100644 --- a/chrome/common/extensions/manifest_handlers/externally_connectable.cc +++ b/chrome/common/extensions/manifest_handlers/externally_connectable.cc @@ -9,10 +9,10 @@ #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/extensions/api/manifest_types.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "extensions/common/error_utils.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/api_permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/url_pattern.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "url/gurl.h" diff --git a/chrome/common/extensions/manifest_handlers/externally_connectable.h b/chrome/common/extensions/manifest_handlers/externally_connectable.h index ede81b8..681da8b 100644 --- a/chrome/common/extensions/manifest_handlers/externally_connectable.h +++ b/chrome/common/extensions/manifest_handlers/externally_connectable.h @@ -9,7 +9,7 @@ #include <vector> #include "base/memory/scoped_ptr.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/install_warning.h" #include "extensions/common/manifest_handler.h" #include "extensions/common/url_pattern_set.h" diff --git a/chrome/common/extensions/manifest_handlers/icons_handler.cc b/chrome/common/extensions/manifest_handlers/icons_handler.cc index 35de4f8..7434218 100644 --- a/chrome/common/extensions/manifest_handlers/icons_handler.cc +++ b/chrome/common/extensions/manifest_handlers/icons_handler.cc @@ -10,10 +10,10 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/manifest_handler_helpers.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/common/extensions/manifest_handlers/icons_handler.h b/chrome/common/extensions/manifest_handlers/icons_handler.h index 147e7cf..924eb18 100644 --- a/chrome/common/extensions/manifest_handlers/icons_handler.h +++ b/chrome/common/extensions/manifest_handlers/icons_handler.h @@ -7,8 +7,8 @@ #include <string> -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "extensions/common/manifest_handler.h" diff --git a/chrome/common/extensions/manifest_handlers/kiosk_mode_info.h b/chrome/common/extensions/manifest_handlers/kiosk_mode_info.h index 71144b7..07805b4 100644 --- a/chrome/common/extensions/manifest_handlers/kiosk_mode_info.h +++ b/chrome/common/extensions/manifest_handlers/kiosk_mode_info.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_handler.h" diff --git a/chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.cc b/chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.cc index 569568c..b1277d8 100644 --- a/chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.cc +++ b/chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.cc @@ -7,8 +7,8 @@ #include "base/strings/utf_string_conversions.h" #include "base/version.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/extension.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/manifest_handlers/nacl_modules_handler.h b/chrome/common/extensions/manifest_handlers/nacl_modules_handler.h index 743eed2..123536c 100644 --- a/chrome/common/extensions/manifest_handlers/nacl_modules_handler.h +++ b/chrome/common/extensions/manifest_handlers/nacl_modules_handler.h @@ -8,7 +8,7 @@ #include <list> #include <string> -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/chrome/common/extensions/manifest_handlers/offline_enabled_info.h b/chrome/common/extensions/manifest_handlers/offline_enabled_info.h index ae2199fa..760624b 100644 --- a/chrome/common/extensions/manifest_handlers/offline_enabled_info.h +++ b/chrome/common/extensions/manifest_handlers/offline_enabled_info.h @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_handler.h" diff --git a/chrome/common/extensions/manifest_handlers/requirements_handler.h b/chrome/common/extensions/manifest_handlers/requirements_handler.h index e9b2c9e..36d20f1 100644 --- a/chrome/common/extensions/manifest_handlers/requirements_handler.h +++ b/chrome/common/extensions/manifest_handlers/requirements_handler.h @@ -8,7 +8,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_handler.h" diff --git a/chrome/common/extensions/manifest_handlers/sandboxed_page_info.h b/chrome/common/extensions/manifest_handlers/sandboxed_page_info.h index eb3c5dc..1af913b 100644 --- a/chrome/common/extensions/manifest_handlers/sandboxed_page_info.h +++ b/chrome/common/extensions/manifest_handlers/sandboxed_page_info.h @@ -7,7 +7,7 @@ #include <string> -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" #include "extensions/common/url_pattern_set.h" diff --git a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc index c71a1c3..8eff8e4 100644 --- a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc +++ b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc @@ -6,11 +6,11 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/extensions/permissions/settings_override_permission.h" #include "extensions/common/error_utils.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/api_permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/permissions/permissions_info.h" #include "url/gurl.h" diff --git a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.h b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.h index ace8c58..3ab9c7e 100644 --- a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.h +++ b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.h @@ -6,7 +6,7 @@ #define CHROME_COMMON_EXTENSIONS_MANIFEST_HANDLERS_SETTINGS_OVERRIDES_HANDLER_H_ #include "chrome/common/extensions/api/manifest_types.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc b/chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc index 6b9a332..c9f4162 100644 --- a/chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc +++ b/chrome/common/extensions/manifest_handlers/settings_overrides_handler_unittest.cc @@ -6,9 +6,9 @@ #include "base/json/json_string_value_serializer.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/common/extensions/manifest_url_handler.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/manifest_handlers/shared_module_info.h b/chrome/common/extensions/manifest_handlers/shared_module_info.h index ef9d869..ba36e3b 100644 --- a/chrome/common/extensions/manifest_handlers/shared_module_info.h +++ b/chrome/common/extensions/manifest_handlers/shared_module_info.h @@ -9,7 +9,7 @@ #include <vector> #include "base/values.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/chrome/common/extensions/manifest_handlers/shared_module_manifest_unittest.cc b/chrome/common/extensions/manifest_handlers/shared_module_manifest_unittest.cc index 0fbdcfc..d30c0b7 100644 --- a/chrome/common/extensions/manifest_handlers/shared_module_manifest_unittest.cc +++ b/chrome/common/extensions/manifest_handlers/shared_module_manifest_unittest.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "base/version.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/shared_module_info.h" #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/common/extensions/manifest_handlers/theme_handler.h b/chrome/common/extensions/manifest_handlers/theme_handler.h index 64f650e..6e7651e 100644 --- a/chrome/common/extensions/manifest_handlers/theme_handler.h +++ b/chrome/common/extensions/manifest_handlers/theme_handler.h @@ -5,7 +5,7 @@ #ifndef CHROME_COMMON_EXTENSIONS_MANIFEST_HANDLERS_THEME_HANDLER_H_ #define CHROME_COMMON_EXTENSIONS_MANIFEST_HANDLERS_THEME_HANDLER_H_ -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace base { diff --git a/chrome/common/extensions/manifest_tests/extension_manifest_test.h b/chrome/common/extensions/manifest_tests/extension_manifest_test.h index 8b5908f..d716943 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifest_test.h +++ b/chrome/common/extensions/manifest_tests/extension_manifest_test.h @@ -8,8 +8,8 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/features/feature_channel.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc index 0d15bf2..ae819d8 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_background_unittest.cc @@ -7,10 +7,10 @@ #include "base/command_line.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/features/feature_channel.h" #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/manifest_handlers/background_info.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc index c87b3c7..187be01 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_unittest.cc @@ -3,13 +3,13 @@ // found in the LICENSE file. #include "base/command_line.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/url_constants.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/switches.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_default_extent_path_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_default_extent_path_unittest.cc index b2fe417..aeead3f 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_default_extent_path_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_default_extent_path_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" TEST_F(ExtensionManifestTest, DefaultPathForExtent) { diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc index 27bf3e4..c2baa8d 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_devtools_unittest.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" #include "chrome/common/extensions/manifest_url_handler.h" -#include "chrome/common/extensions/permissions/permissions_data.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/permissions/permissions_data.h" #include "testing/gtest/include/gtest/gtest.h" class DevToolsPageManifestTest : public ExtensionManifestTest { diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_experimental_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_experimental_unittest.cc index 368bb5d..b376f47 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_experimental_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_experimental_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" #include "base/command_line.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/switches.h" diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc index 415f5c6..e0a87e2 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.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/common/extensions/extension.h" #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" #include "chrome/common/extensions/manifest_url_handler.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc index d014a851..1408494 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_icons_unittest.cc @@ -3,11 +3,11 @@ // found in the LICENSE file. #include "base/memory/linked_ptr.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" namespace extensions { diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc index 8aeb13e..b9737aa 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc @@ -6,9 +6,9 @@ #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" #include "chrome/common/extensions/manifest_url_handler.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_isolatedapp_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_isolatedapp_unittest.cc index 245f5af..26abab5 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_isolatedapp_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_isolatedapp_unittest.cc @@ -5,8 +5,8 @@ #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" #include "base/command_line.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/switches.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_kiosk_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_kiosk_unittest.cc index fa00693..b223e52 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_kiosk_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_kiosk_unittest.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/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/kiosk_mode_info.h" #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_launch_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_launch_unittest.cc index 0b7f076..0279d36 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_launch_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_launch_unittest.cc @@ -4,10 +4,10 @@ #include "base/command_line.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_offline_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_offline_unittest.cc index a53a5cc..e62257c 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_offline_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_offline_unittest.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/common/extensions/extension.h" #include "chrome/common/extensions/manifest_handlers/offline_enabled_info.h" #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_old_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_old_unittest.cc index 19f46a4..b8c4e5f 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_old_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_old_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" // Tests that the old permission name "unlimited_storage" still works for diff --git a/chrome/common/extensions/manifest_url_handler.cc b/chrome/common/extensions/manifest_url_handler.cc index 52229bd..1c7d3d0 100644 --- a/chrome/common/extensions/manifest_url_handler.cc +++ b/chrome/common/extensions/manifest_url_handler.cc @@ -13,7 +13,6 @@ #include "base/values.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/url_constants.h" #include "extensions/common/error_utils.h" #include "extensions/common/file_util.h" @@ -21,6 +20,7 @@ #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/api_permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/manifest_url_handler.h b/chrome/common/extensions/manifest_url_handler.h index 34934dd..181171e 100644 --- a/chrome/common/extensions/manifest_url_handler.h +++ b/chrome/common/extensions/manifest_url_handler.h @@ -7,7 +7,7 @@ #include <string> -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace base { diff --git a/chrome/common/extensions/mime_types_handler.h b/chrome/common/extensions/mime_types_handler.h index 75acc5b..515854c 100644 --- a/chrome/common/extensions/mime_types_handler.h +++ b/chrome/common/extensions/mime_types_handler.h @@ -10,7 +10,7 @@ #include <vector> #include "base/basictypes.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" #include "extensions/common/url_pattern.h" #include "extensions/common/url_pattern_set.h" diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/chrome/common/extensions/permissions/permission_set_unittest.cc index 302df86..9fc6dbf 100644 --- a/chrome/common/extensions/permissions/permission_set_unittest.cc +++ b/chrome/common/extensions/permissions/permission_set_unittest.cc @@ -9,16 +9,16 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_test_util.h" #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/common/extensions/permissions/chrome_permission_message_provider.h" #include "chrome/common/extensions/permissions/permission_message_util.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/extensions/permissions/socket_permission.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/permissions/permission_message_provider.h" #include "extensions/common/permissions/permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/permissions/permissions_info.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/permissions/settings_override_permission_unittest.cc b/chrome/common/extensions/permissions/settings_override_permission_unittest.cc index dd98321..ad1dbf0 100644 --- a/chrome/common/extensions/permissions/settings_override_permission_unittest.cc +++ b/chrome/common/extensions/permissions/settings_override_permission_unittest.cc @@ -8,10 +8,10 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/extensions/permissions/settings_override_permission.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "testing/gtest/include/gtest/gtest.h" namespace extensions { diff --git a/chrome/common/extensions/sync_helper.cc b/chrome/common/extensions/sync_helper.cc index e09e627..9c4f0ac 100644 --- a/chrome/common/extensions/sync_helper.cc +++ b/chrome/common/extensions/sync_helper.cc @@ -6,9 +6,9 @@ #include "base/logging.h" #include "chrome/common/extensions/api/plugins/plugins_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_url_handler.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" namespace extensions { diff --git a/chrome/common/extensions/sync_type_unittest.cc b/chrome/common/extensions/sync_type_unittest.cc index d7d9c465..2ba640a 100644 --- a/chrome/common/extensions/sync_type_unittest.cc +++ b/chrome/common/extensions/sync_type_unittest.cc @@ -4,9 +4,9 @@ #include "base/files/file_path.h" #include "chrome/common/extensions/api/plugins/plugins_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/sync_helper.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/web_accessible_resources_handler.h b/chrome/common/extensions/web_accessible_resources_handler.h index 61db433..95f262f 100644 --- a/chrome/common/extensions/web_accessible_resources_handler.h +++ b/chrome/common/extensions/web_accessible_resources_handler.h @@ -7,7 +7,7 @@ #include <string> -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/chrome/common/extensions/webview_handler.h b/chrome/common/extensions/webview_handler.h index 64c7db3..5d9b530 100644 --- a/chrome/common/extensions/webview_handler.h +++ b/chrome/common/extensions/webview_handler.h @@ -7,7 +7,7 @@ #include <string> -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/chrome/common/pepper_permission_util.cc b/chrome/common/pepper_permission_util.cc index b34e457..0c9a10d 100644 --- a/chrome/common/pepper_permission_util.cc +++ b/chrome/common/pepper_permission_util.cc @@ -10,10 +10,10 @@ #include "base/sha1.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_tokenizer.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_handlers/shared_module_info.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" using extensions::Extension; using extensions::Manifest; diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index 926ccd3..ffb7765 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -19,7 +19,6 @@ #include "chrome/common/content_settings_pattern.h" #include "chrome/common/crash_keys.h" #include "chrome/common/extensions/chrome_extensions_client.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_process_policy.h" #include "chrome/common/extensions/extension_set.h" @@ -75,6 +74,7 @@ #include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view_visitor.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_urls.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/renderer/chrome_content_renderer_client_unittest.cc b/chrome/renderer/chrome_content_renderer_client_unittest.cc index 51f1a3c..a2fcbc1 100644 --- a/chrome/renderer/chrome_content_renderer_client_unittest.cc +++ b/chrome/renderer/chrome_content_renderer_client_unittest.cc @@ -7,9 +7,9 @@ #include <vector> #include "base/strings/utf_string_conversions.h" -#include "chrome/common/extensions/extension.h" #include "chrome/renderer/searchbox/search_bouncer.h" #include "content/public/common/webplugininfo.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/renderer/extensions/chrome_v8_context.cc b/chrome/renderer/extensions/chrome_v8_context.cc index d180fcf..e2c7e32 100644 --- a/chrome/renderer/extensions/chrome_v8_context.cc +++ b/chrome/renderer/extensions/chrome_v8_context.cc @@ -8,7 +8,6 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string_split.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/features/base_feature_provider.h" #include "chrome/renderer/extensions/chrome_v8_extension.h" @@ -16,6 +15,7 @@ #include "chrome/renderer/extensions/user_script_slave.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/v8_value_converter.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_api.h" #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h" diff --git a/chrome/renderer/extensions/chrome_v8_context_set.cc b/chrome/renderer/extensions/chrome_v8_context_set.cc index 49c9397..40b6fe1d 100644 --- a/chrome/renderer/extensions/chrome_v8_context_set.cc +++ b/chrome/renderer/extensions/chrome_v8_context_set.cc @@ -8,12 +8,12 @@ #include "base/message_loop/message_loop.h" #include "base/tracked_objects.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "chrome/renderer/extensions/chrome_v8_context.h" #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/web/WebDocument.h" diff --git a/chrome/renderer/extensions/chrome_v8_context_set_unittest.cc b/chrome/renderer/extensions/chrome_v8_context_set_unittest.cc index 1470158..002b129 100644 --- a/chrome/renderer/extensions/chrome_v8_context_set_unittest.cc +++ b/chrome/renderer/extensions/chrome_v8_context_set_unittest.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "base/message_loop/message_loop.h" -#include "chrome/common/extensions/extension.h" #include "chrome/renderer/extensions/chrome_v8_context.h" #include "chrome/renderer/extensions/chrome_v8_context_set.h" +#include "extensions/common/extension.h" #include "extensions/common/features/feature.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/web/WebFrame.h" diff --git a/chrome/renderer/extensions/chrome_v8_extension.cc b/chrome/renderer/extensions/chrome_v8_extension.cc index 475a202..02d287f 100644 --- a/chrome/renderer/extensions/chrome_v8_extension.cc +++ b/chrome/renderer/extensions/chrome_v8_extension.cc @@ -8,11 +8,11 @@ #include "base/logging.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/renderer/extensions/chrome_v8_context.h" #include "chrome/renderer/extensions/dispatcher.h" #include "content/public/renderer/render_view.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_api.h" #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebFrame.h" diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc index 943e97d..11f1f3b 100644 --- a/chrome/renderer/extensions/dispatcher.cc +++ b/chrome/renderer/extensions/dispatcher.cc @@ -18,13 +18,11 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/crash_keys.h" #include "chrome/common/extensions/api/messaging/message.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/common/extensions/manifest_handlers/externally_connectable.h" #include "chrome/common/extensions/manifest_handlers/sandboxed_page_info.h" #include "chrome/common/extensions/message_bundle.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/url_constants.h" #include "chrome/renderer/chrome_render_process_observer.h" #include "chrome/renderer/extensions/api_activity_logger.h" @@ -72,6 +70,7 @@ #include "content/public/renderer/render_view.h" #include "content/public/renderer/v8_value_converter.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_api.h" #include "extensions/common/extension_urls.h" #include "extensions/common/features/feature.h" @@ -80,6 +79,7 @@ #include "extensions/common/manifest_constants.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/permissions/permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/view_type.h" #include "grit/common_resources.h" #include "grit/renderer_resources.h" diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc index 341d93e..2fe4a24 100644 --- a/chrome/renderer/extensions/event_bindings.cc +++ b/chrome/renderer/extensions/event_bindings.cc @@ -14,7 +14,6 @@ #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/value_counter.h" @@ -29,6 +28,7 @@ #include "content/public/renderer/render_view.h" #include "content/public/renderer/v8_value_converter.h" #include "extensions/common/event_filter.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/view_type.h" #include "grit/renderer_resources.h" diff --git a/chrome/renderer/extensions/page_actions_custom_bindings.cc b/chrome/renderer/extensions/page_actions_custom_bindings.cc index 3c93154..31140e4 100644 --- a/chrome/renderer/extensions/page_actions_custom_bindings.cc +++ b/chrome/renderer/extensions/page_actions_custom_bindings.cc @@ -8,8 +8,8 @@ #include "base/bind.h" #include "chrome/common/extensions/api/extension_action/action_info.h" -#include "chrome/common/extensions/extension.h" #include "chrome/renderer/extensions/dispatcher.h" +#include "extensions/common/extension.h" #include "grit/renderer_resources.h" #include "v8/include/v8.h" diff --git a/chrome/renderer/extensions/renderer_permissions_policy_delegate.h b/chrome/renderer/extensions/renderer_permissions_policy_delegate.h index ace06c9..5638c34 100644 --- a/chrome/renderer/extensions/renderer_permissions_policy_delegate.h +++ b/chrome/renderer/extensions/renderer_permissions_policy_delegate.h @@ -5,7 +5,7 @@ #ifndef CHROME_RENDERER_EXTENSIONS_RENDERER_PERMISSIONS_POLICY_DELEGATE_H_ #define CHROME_RENDERER_EXTENSIONS_RENDERER_PERMISSIONS_POLICY_DELEGATE_H_ -#include "chrome/common/extensions/permissions/permissions_data.h" +#include "extensions/common/permissions/permissions_data.h" namespace extensions { diff --git a/chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc b/chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc index 653a5a5..18c028c 100644 --- a/chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc +++ b/chrome/renderer/extensions/renderer_permissions_policy_delegate_unittest.cc @@ -4,15 +4,15 @@ #include "base/command_line.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/renderer/extensions/dispatcher.h" #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h" #include "content/public/test/mock_render_process_host.h" #include "content/public/test/mock_render_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" +#include "extensions/common/permissions/permissions_data.h" #include "testing/gtest/include/gtest/gtest.h" namespace extensions { diff --git a/chrome/renderer/extensions/resource_request_policy.cc b/chrome/renderer/extensions/resource_request_policy.cc index 34bc7f3..ad47414 100644 --- a/chrome/renderer/extensions/resource_request_policy.cc +++ b/chrome/renderer/extensions/resource_request_policy.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/strings/stringprintf.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/extensions/manifest_url_handler.h" @@ -16,6 +15,7 @@ #include "chrome/common/url_constants.h" #include "content/public/common/page_transition_types.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/web/WebConsoleMessage.h" #include "third_party/WebKit/public/web/WebDocument.h" diff --git a/chrome/renderer/extensions/runtime_custom_bindings.cc b/chrome/renderer/extensions/runtime_custom_bindings.cc index fba7355..5a0915e 100644 --- a/chrome/renderer/extensions/runtime_custom_bindings.cc +++ b/chrome/renderer/extensions/runtime_custom_bindings.cc @@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/renderer/extensions/api_activity_logger.h" #include "chrome/renderer/extensions/chrome_v8_context.h" @@ -15,6 +14,7 @@ #include "chrome/renderer/extensions/extension_helper.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/v8_value_converter.h" +#include "extensions/common/extension.h" #include "extensions/common/features/feature.h" #include "extensions/common/features/feature_provider.h" #include "extensions/common/manifest.h" diff --git a/chrome/renderer/extensions/user_script_scheduler.cc b/chrome/renderer/extensions/user_script_scheduler.cc index 4966c44a..0b20bcf 100644 --- a/chrome/renderer/extensions/user_script_scheduler.cc +++ b/chrome/renderer/extensions/user_script_scheduler.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/renderer/chrome_render_process_observer.h" #include "chrome/renderer/extensions/chrome_v8_context.h" #include "chrome/renderer/extensions/dispatcher.h" @@ -20,6 +19,7 @@ #include "content/public/renderer/v8_value_converter.h" #include "extensions/common/error_utils.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/permissions/permissions_data.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebVector.h" #include "third_party/WebKit/public/web/WebDocument.h" diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc index 526a510..4b7b9e9 100644 --- a/chrome/renderer/extensions/user_script_slave.cc +++ b/chrome/renderer/extensions/user_script_slave.cc @@ -14,10 +14,8 @@ #include "base/strings/stringprintf.h" #include "base/timer/elapsed_timer.h" #include "chrome/common/extensions/csp_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/extension_set.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/url_constants.h" #include "chrome/renderer/chrome_render_process_observer.h" #include "chrome/renderer/extensions/dom_activity_logger.h" @@ -25,6 +23,8 @@ #include "chrome/renderer/isolated_world_ids.h" #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" +#include "extensions/common/extension.h" +#include "extensions/common/permissions/permissions_data.h" #include "grit/renderer_resources.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/platform/WebVector.h" diff --git a/chrome/renderer/extensions/webstore_bindings.cc b/chrome/renderer/extensions/webstore_bindings.cc index 6237a24..659baef 100644 --- a/chrome/renderer/extensions/webstore_bindings.cc +++ b/chrome/renderer/extensions/webstore_bindings.cc @@ -5,11 +5,11 @@ #include "chrome/renderer/extensions/webstore_bindings.h" #include "base/strings/string_util.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/renderer/extensions/chrome_v8_context.h" #include "content/public/renderer/render_view.h" +#include "extensions/common/extension.h" #include "grit/renderer_resources.h" #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebElement.h" diff --git a/chrome/renderer/searchbox/searchbox_extension.cc b/chrome/renderer/searchbox/searchbox_extension.cc index bab657d..acc5401 100644 --- a/chrome/renderer/searchbox/searchbox_extension.cc +++ b/chrome/renderer/searchbox/searchbox_extension.cc @@ -11,13 +11,13 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/autocomplete_match_type.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/instant_types.h" #include "chrome/common/ntp_logging_events.h" #include "chrome/common/url_constants.h" #include "chrome/renderer/searchbox/searchbox.h" #include "content/public/common/url_constants.h" #include "content/public/renderer/render_view.h" +#include "extensions/common/extension.h" #include "grit/renderer_resources.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/web/WebDocument.h" diff --git a/chrome/test/base/chrome_render_view_test.cc b/chrome/test/base/chrome_render_view_test.cc index 4cf279c..47e06f9 100644 --- a/chrome/test/base/chrome_render_view_test.cc +++ b/chrome/test/base/chrome_render_view_test.cc @@ -5,7 +5,6 @@ #include "chrome/test/base/chrome_render_view_test.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/extensions/chrome_v8_context_set.h" #include "chrome/renderer/extensions/chrome_v8_extension.h" @@ -18,14 +17,15 @@ #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/common/renderer_preferences.h" #include "content/public/renderer/render_view.h" +#include "extensions/common/extension.h" #include "grit/renderer_resources.h" +#include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "third_party/WebKit/public/web/WebKit.h" #include "third_party/WebKit/public/web/WebScriptController.h" #include "third_party/WebKit/public/web/WebScriptSource.h" #include "third_party/WebKit/public/web/WebView.h" -#include "third_party/WebKit/public/platform/WebURLRequest.h" #if defined(OS_LINUX) && !defined(USE_AURA) #include "ui/base/gtk/event_synthesis_gtk.h" diff --git a/chrome/test/perf/perf_ui_test_suite.cc b/chrome/test/perf/perf_ui_test_suite.cc index 01b7ee8..1f37d02 100644 --- a/chrome/test/perf/perf_ui_test_suite.cc +++ b/chrome/test/perf/perf_ui_test_suite.cc @@ -16,9 +16,9 @@ #include "chrome/browser/themes/browser_theme_pack.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/perf/generate_profile.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/common/extension.h" #if defined(OS_WIN) #include <atlbase.h> diff --git a/chrome/test/remoting/remote_desktop_browsertest.cc b/chrome/test/remoting/remote_desktop_browsertest.cc index 7a02366..6773925 100644 --- a/chrome/test/remoting/remote_desktop_browsertest.cc +++ b/chrome/test/remoting/remote_desktop_browsertest.cc @@ -9,7 +9,6 @@ #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/test/remoting/key_code_conv.h" #include "chrome/test/remoting/page_load_notification_observer.h" @@ -18,6 +17,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/test/test_utils.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "ui/base/window_open_disposition.h" namespace remoting { diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc index 3cc0d30..68eb979 100644 --- a/chrome/utility/chrome_content_utility_client.cc +++ b/chrome/utility/chrome_content_utility_client.cc @@ -15,7 +15,6 @@ #include "base/time/time.h" #include "chrome/common/chrome_utility_messages.h" #include "chrome/common/extensions/chrome_extensions_client.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/update_manifest.h" #include "chrome/common/safe_browsing/zip_analyzer.h" @@ -25,6 +24,7 @@ #include "content/public/child/image_decoder_utils.h" #include "content/public/common/content_paths.h" #include "content/public/utility/utility_thread.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "media/base/media.h" #include "media/base/media_file_checker.h" diff --git a/chrome/utility/extensions/unpacker.cc b/chrome/utility/extensions/unpacker.cc index caeaf6e..371c59f 100644 --- a/chrome/utility/extensions/unpacker.cc +++ b/chrome/utility/extensions/unpacker.cc @@ -19,12 +19,12 @@ #include "base/values.h" #include "chrome/common/chrome_utility_messages.h" #include "chrome/common/extensions/api/i18n/default_locale_handler.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/extension_l10n_util.h" #include "content/public/child/image_decoder_utils.h" #include "content/public/common/common_param_traits.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #include "grit/generated_resources.h" diff --git a/chrome/utility/extensions/unpacker_unittest.cc b/chrome/utility/extensions/unpacker_unittest.cc index eb74a17..28a2522 100644 --- a/chrome/utility/extensions/unpacker_unittest.cc +++ b/chrome/utility/extensions/unpacker_unittest.cc @@ -9,9 +9,9 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "chrome/utility/extensions/unpacker.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/extensions/DEPS b/extensions/DEPS index 2b0dd51..f286a2e 100644 --- a/extensions/DEPS +++ b/extensions/DEPS @@ -17,4 +17,10 @@ specific_include_rules = { "^manifest_permission_set_unittest\.cc$": [ "+chrome/common/extensions/extension_messages.h", ], + "^permissions_data_unittest\.cc$": [ + "+chrome/common/chrome_version_info.h", + "+chrome/common/extensions/extension_test_util.h", + "+chrome/common/extensions/features/feature_channel.h", + "+chrome/common/extensions/permissions/socket_permission.h", + ], } diff --git a/extensions/browser/DEPS b/extensions/browser/DEPS index eb64dd1..55fbba0 100644 --- a/extensions/browser/DEPS +++ b/extensions/browser/DEPS @@ -17,7 +17,6 @@ include_rules = [ "+chrome/browser/extensions/extension_system.h", "+chrome/browser/extensions/extension_util.h", "+chrome/browser/renderer_host/chrome_render_message_filter.h", - "+chrome/common/extensions/extension.h", "+chrome/common/extensions/extension_messages.h", "+chrome/common/extensions/extension_set.h", "+grit/generated_resources.h", diff --git a/extensions/browser/admin_policy.cc b/extensions/browser/admin_policy.cc index 2cc0b57..903c4e0 100644 --- a/extensions/browser/admin_policy.cc +++ b/extensions/browser/admin_policy.cc @@ -5,7 +5,7 @@ #include "extensions/browser/admin_policy.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/extensions/browser/admin_policy_unittest.cc b/extensions/browser/admin_policy_unittest.cc index 02d606d..f85e3ef 100644 --- a/extensions/browser/admin_policy_unittest.cc +++ b/extensions/browser/admin_policy_unittest.cc @@ -5,7 +5,7 @@ #include "extensions/browser/admin_policy.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/extensions/browser/extension_function.h b/extensions/browser/extension_function.h index 69effe0..aa0ed03 100644 --- a/extensions/browser/extension_function.h +++ b/extensions/browser/extension_function.h @@ -16,10 +16,10 @@ #include "base/process/process.h" #include "base/sequenced_task_runner_helpers.h" #include "chrome/browser/extensions/extension_function_histogram_value.h" -#include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/console_message_level.h" #include "extensions/browser/info_map.h" +#include "extensions/common/extension.h" #include "ipc/ipc_message.h" class ChromeRenderMessageFilter; diff --git a/extensions/browser/info_map.cc b/extensions/browser/info_map.cc index 012f719..2bff206 100644 --- a/extensions/browser/info_map.cc +++ b/extensions/browser/info_map.cc @@ -4,10 +4,10 @@ #include "extensions/browser/info_map.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" #include "content/public/browser/browser_thread.h" #include "extensions/common/constants.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/incognito_info.h" using content::BrowserThread; diff --git a/extensions/browser/info_map_unittest.cc b/extensions/browser/info_map_unittest.cc index b023eed..8eaf488 100644 --- a/extensions/browser/info_map_unittest.cc +++ b/extensions/browser/info_map_unittest.cc @@ -6,9 +6,9 @@ #include "base/message_loop/message_loop.h" #include "base/path_service.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/extension.h" #include "content/public/test/test_browser_thread.h" #include "extensions/browser/info_map.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/extensions/browser/lazy_background_task_queue.cc b/extensions/browser/lazy_background_task_queue.cc index 987908b..f53cdd3 100644 --- a/extensions/browser/lazy_background_task_queue.cc +++ b/extensions/browser/lazy_background_task_queue.cc @@ -9,7 +9,6 @@ #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/notification_service.h" @@ -20,6 +19,7 @@ #include "extensions/browser/extensions_browser_client.h" #include "extensions/browser/process_manager.h" #include "extensions/browser/process_map.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/view_type.h" diff --git a/extensions/browser/lazy_background_task_queue_unittest.cc b/extensions/browser/lazy_background_task_queue_unittest.cc index 863a520..35c02b8 100644 --- a/extensions/browser/lazy_background_task_queue_unittest.cc +++ b/extensions/browser/lazy_background_task_queue_unittest.cc @@ -8,10 +8,10 @@ #include "base/command_line.h" #include "chrome/browser/extensions/extension_service_unittest.h" #include "chrome/browser/extensions/test_extension_system.h" -#include "chrome/common/extensions/extension.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread_bundle.h" #include "extensions/browser/process_manager.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/extensions/browser/process_manager.cc b/extensions/browser/process_manager.cc index 3ae5be4..cccb800 100644 --- a/extensions/browser/process_manager.cc +++ b/extensions/browser/process_manager.cc @@ -19,7 +19,6 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" @@ -36,6 +35,7 @@ #include "content/public/common/renderer_preferences.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/browser/view_type_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/manifest_handlers/incognito_info.h" #include "extensions/common/switches.h" diff --git a/extensions/common/DEPS b/extensions/common/DEPS index 34509b4..6a9adce 100644 --- a/extensions/common/DEPS +++ b/extensions/common/DEPS @@ -9,10 +9,10 @@ include_rules = [ # # TODO(benwells): Remove these. http://crbug.com/162530 "+chrome/common/extensions/api/generated_schemas.h", - "+chrome/common/extensions/extension.h", - "+chrome/common/extensions/permissions/permissions_data.h", + "+grit/chromium_strings.h", "+grit/common_resources.h", "+grit/extensions_api_resources.h", + "+grit/theme_resources.h", # TODO(jamescook): Extract extensions-related strings from this file. "+grit/generated_resources.h", ] diff --git a/chrome/common/extensions/extension.cc b/extensions/common/extension.cc index 71018cc..f38d547 100644 --- a/chrome/common/extensions/extension.cc +++ b/extensions/common/extension.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/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "base/base64.h" #include "base/basictypes.h" @@ -20,8 +20,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "base/version.h" -#include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "content/public/common/url_constants.h" #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" @@ -31,13 +29,13 @@ #include "extensions/common/manifest_handler.h" #include "extensions/common/permissions/api_permission_set.h" #include "extensions/common/permissions/permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/permissions/permissions_info.h" #include "extensions/common/switches.h" #include "extensions/common/url_pattern_set.h" #include "grit/chromium_strings.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" -#include "third_party/skia/include/core/SkBitmap.h" #include "url/url_util.h" #if defined(OS_WIN) diff --git a/chrome/common/extensions/extension.h b/extensions/common/extension.h index 2bb79eb..642efb2 100644 --- a/chrome/common/extensions/extension.h +++ b/extensions/common/extension.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_COMMON_EXTENSIONS_EXTENSION_H_ -#define CHROME_COMMON_EXTENSIONS_EXTENSION_H_ +#ifndef EXTENSIONS_COMMON_EXTENSION_H_ +#define EXTENSIONS_COMMON_EXTENSION_H_ #include <algorithm> #include <iosfwd> @@ -532,4 +532,4 @@ struct UpdatedExtensionPermissionsInfo { } // namespace extensions -#endif // CHROME_COMMON_EXTENSIONS_EXTENSION_H_ +#endif // EXTENSIONS_COMMON_EXTENSION_H_ diff --git a/extensions/common/extension_api.cc b/extensions/common/extension_api.cc index a8b2fa0..dd68ffd 100644 --- a/extensions/common/extension_api.cc +++ b/extensions/common/extension_api.cc @@ -17,11 +17,11 @@ #include "base/strings/string_util.h" #include "base/values.h" #include "chrome/common/extensions/api/generated_schemas.h" -#include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/permissions_data.h" +#include "extensions/common/extension.h" #include "extensions/common/features/feature.h" #include "extensions/common/features/feature_provider.h" #include "extensions/common/permissions/permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "grit/common_resources.h" #include "grit/extensions_api_resources.h" #include "ui/base/resource/resource_bundle.h" diff --git a/extensions/common/extension_builder.cc b/extensions/common/extension_builder.cc index ef5a14f..f993e94 100644 --- a/extensions/common/extension_builder.cc +++ b/extensions/common/extension_builder.cc @@ -4,7 +4,7 @@ #include "extensions/common/extension_builder.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" namespace extensions { diff --git a/extensions/common/manifest_handler.cc b/extensions/common/manifest_handler.cc index 944389d..4546f32 100644 --- a/extensions/common/manifest_handler.cc +++ b/extensions/common/manifest_handler.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "base/stl_util.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/permissions/manifest_permission.h" #include "extensions/common/permissions/manifest_permission_set.h" diff --git a/extensions/common/manifest_handler_unittest.cc b/extensions/common/manifest_handler_unittest.cc index 620f0d6..9a3a292 100644 --- a/extensions/common/manifest_handler_unittest.cc +++ b/extensions/common/manifest_handler_unittest.cc @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #include "extensions/common/install_warning.h" #include "extensions/common/manifest_handler.h" diff --git a/extensions/common/manifest_handlers/background_info.cc b/extensions/common/manifest_handlers/background_info.cc index f32cc4b..1ec404e 100644 --- a/extensions/common/manifest_handlers/background_info.cc +++ b/extensions/common/manifest_handlers/background_info.cc @@ -10,12 +10,12 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" #include "extensions/common/file_util.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/api_permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/switches.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/extensions/common/manifest_handlers/background_info.h b/extensions/common/manifest_handlers/background_info.h index 40d4920..113c341 100644 --- a/extensions/common/manifest_handlers/background_info.h +++ b/extensions/common/manifest_handlers/background_info.h @@ -9,7 +9,7 @@ #include <vector> #include "base/values.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" #include "url/gurl.h" diff --git a/extensions/common/manifest_handlers/incognito_info.cc b/extensions/common/manifest_handlers/incognito_info.cc index 686c84b..b57a8a6 100644 --- a/extensions/common/manifest_handlers/incognito_info.cc +++ b/extensions/common/manifest_handlers/incognito_info.cc @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" namespace extensions { diff --git a/extensions/common/manifest_handlers/incognito_info.h b/extensions/common/manifest_handlers/incognito_info.h index b275761..cd44934 100644 --- a/extensions/common/manifest_handlers/incognito_info.h +++ b/extensions/common/manifest_handlers/incognito_info.h @@ -6,7 +6,7 @@ #define EXTENSIONS_COMMON_MANIFEST_HANDLERS_INCOGNITO_INFO_H_ #include "base/strings/string16.h" -#include "chrome/common/extensions/extension.h" +#include "extensions/common/extension.h" #include "extensions/common/manifest_handler.h" namespace extensions { diff --git a/chrome/common/extensions/permissions/permissions_data.cc b/extensions/common/permissions/permissions_data.cc index e023712..f43d1d7 100644 --- a/chrome/common/extensions/permissions/permissions_data.cc +++ b/extensions/common/permissions/permissions_data.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/common/extensions/permissions/permissions_data.h" +#include "extensions/common/permissions/permissions_data.h" #include "base/command_line.h" #include "base/memory/scoped_ptr.h" @@ -11,11 +11,10 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/extension_constants.h" #include "content/public/common/url_constants.h" #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/extensions_client.h" #include "extensions/common/features/feature.h" #include "extensions/common/features/feature_provider.h" diff --git a/chrome/common/extensions/permissions/permissions_data.h b/extensions/common/permissions/permissions_data.h index d0b6413..72b9d24 100644 --- a/chrome/common/extensions/permissions/permissions_data.h +++ b/extensions/common/permissions/permissions_data.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_COMMON_EXTENSIONS_PERMISSIONS_PERMISSIONS_DATA_H_ -#define CHROME_COMMON_EXTENSIONS_PERMISSIONS_PERMISSIONS_DATA_H_ +#ifndef EXTENSIONS_COMMON_PERMISSIONS_PERMISSIONS_DATA_H_ +#define EXTENSIONS_COMMON_PERMISSIONS_PERMISSIONS_DATA_H_ #include <map> #include <vector> @@ -215,4 +215,4 @@ class PermissionsData { } // namespace extensions -#endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_PERMISSIONS_DATA_H_ +#endif // EXTENSIONS_COMMON_PERMISSIONS_PERMISSIONS_DATA_H_ diff --git a/chrome/common/extensions/permissions/permissions_data_unittest.cc b/extensions/common/permissions/permissions_data_unittest.cc index f4e0d3e..3ea4856 100644 --- a/chrome/common/extensions/permissions/permissions_data_unittest.cc +++ b/extensions/common/permissions/permissions_data_unittest.cc @@ -9,17 +9,17 @@ #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/chrome_version_info.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_test_util.h" #include "chrome/common/extensions/features/feature_channel.h" -#include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/extensions/permissions/socket_permission.h" #include "content/public/common/socket_permission_request.h" #include "extensions/common/error_utils.h" +#include "extensions/common/extension.h" #include "extensions/common/id_util.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "extensions/common/switches.h" #include "extensions/common/url_pattern_set.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index d673ac1..16d55b5 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -36,6 +36,8 @@ 'common/event_filtering_info.h', 'common/event_matcher.cc', 'common/event_matcher.h', + 'common/extension.cc', + 'common/extension.h', 'common/extension_api.cc', 'common/extension_api.h', 'common/extension_api_stub.cc', @@ -100,6 +102,8 @@ 'common/permissions/permission_message_provider.h', 'common/permissions/permission_set.cc', 'common/permissions/permission_set.h', + 'common/permissions/permissions_data.cc', + 'common/permissions/permissions_data.h', 'common/permissions/permissions_info.cc', 'common/permissions/permissions_info.h', 'common/permissions/permissions_provider.h', |