From e4452d31c6aadb6e9c86836e8b45c0c151223826 Mon Sep 17 00:00:00 2001 From: "yoz@chromium.org" Date: Fri, 15 Nov 2013 23:07:41 +0000 Subject: [PATCH] Move Extension and PermissionsData to extensions/common. BUG=298586 R=cdn@chromium.org, miket@chromium.org, sky@chromium.org TBR=cdn@chromium.org Review URL: https://codereview.chromium.org/15239002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235462 0039d316-1c4b-4281-b951-d872f2087c98 --- apps/app_lifetime_monitor.cc | 2 +- apps/app_load_service.cc | 2 +- apps/app_restore_service.cc | 2 +- apps/app_restore_service_browsertest.cc | 2 +- apps/app_shim/extension_app_shim_handler_mac_unittest.cc | 2 +- apps/launcher.cc | 2 +- apps/saved_files_service_unittest.cc | 2 +- apps/shell_window.cc | 2 +- apps/shell_window_geometry_cache.cc | 2 +- apps/shell_window_registry.cc | 2 +- chrome/browser/app_controller_mac_browsertest.mm | 2 +- chrome/browser/apps/app_url_redirector.cc | 2 +- chrome/browser/apps/chrome_apps_client.cc | 2 +- chrome/browser/apps/shortcut_manager.h | 2 +- chrome/browser/apps/web_view_browsertest.cc | 2 +- chrome/browser/autocomplete/extension_app_provider.cc | 2 +- chrome/browser/autocomplete/shortcuts_provider_unittest.cc | 2 +- chrome/browser/automation/automation_provider_json.cc | 2 +- chrome/browser/automation/automation_provider_observers.cc | 2 +- chrome/browser/automation/automation_util.cc | 2 +- chrome/browser/automation/testing_automation_provider.cc | 4 ++-- .../browser/background/background_application_list_model.cc | 2 +- .../browser/background/background_application_list_model.h | 2 +- .../background_application_list_model_unittest.cc | 2 +- chrome/browser/background/background_contents_service.cc | 2 +- chrome/browser/background/background_mode_manager.cc | 2 +- chrome/browser/background/background_mode_manager_aura.cc | 2 +- .../browser/background/background_mode_manager_chromeos.cc | 2 +- chrome/browser/chrome_content_browser_client.cc | 4 ++-- .../browser/chromeos/accessibility/accessibility_manager.cc | 2 +- .../app_mode/kiosk_app_update_service_browsertest.cc | 2 +- chrome/browser/chromeos/app_mode/startup_app_launcher.cc | 2 +- .../device_local_account_external_policy_loader_unittest.cc | 2 +- .../device_local_account_management_policy_provider.cc | 2 +- ...ice_local_account_management_policy_provider_unittest.cc | 2 +- chrome/browser/chromeos/extensions/echo_private_api.cc | 2 +- chrome/browser/chromeos/extensions/external_cache.cc | 2 +- .../file_manager/file_browser_handler_api_test.cc | 2 +- .../chromeos/file_manager/file_manager_browsertest.cc | 2 +- chrome/browser/chromeos/file_manager/zip_file_creator.h | 2 +- .../chromeos/first_run/drive_first_run_controller.cc | 2 +- .../input_method/component_extension_ime_manager_impl.cc | 2 +- .../browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc | 2 +- chrome/browser/chromeos/login/kiosk_browsertest.cc | 2 +- chrome/browser/chromeos/login/merge_session_load_page.cc | 2 +- chrome/browser/chromeos/offline/offline_load_page.cc | 2 +- .../chromeos/policy/device_local_account_browsertest.cc | 2 +- .../chromeos/system_logs/chrome_internal_log_source.cc | 2 +- .../browser/component_updater/component_updater_service.cc | 2 +- .../content_settings_internal_extension_provider.cc | 2 +- chrome/browser/download/download_item_model_unittest.cc | 2 +- chrome/browser/download/download_shelf_context_menu.cc | 2 +- chrome/browser/download/download_shelf_unittest.cc | 2 +- .../browser/download/download_target_determiner_unittest.cc | 2 +- chrome/browser/extensions/active_tab_apitest.cc | 2 +- chrome/browser/extensions/active_tab_permission_granter.cc | 4 ++-- chrome/browser/extensions/active_tab_unittest.cc | 4 ++-- chrome/browser/extensions/activity_log/activity_database.h | 2 +- chrome/browser/extensions/activity_log/activity_log.cc | 2 +- .../browser/extensions/activity_log/activity_log_policy.cc | 2 +- .../browser/extensions/activity_log/fullstream_ui_policy.cc | 2 +- chrome/browser/extensions/alert_apitest.cc | 2 +- chrome/browser/extensions/all_urls_apitest.cc | 2 +- chrome/browser/extensions/api/api_resource.h | 2 +- chrome/browser/extensions/api/api_resource_manager.h | 2 +- .../browser/extensions/api/api_resource_manager_unittest.cc | 2 +- .../browser/extensions/api/app_runtime/app_runtime_api.cc | 2 +- .../extensions/api/autotest_private/autotest_private_api.cc | 2 +- chrome/browser/extensions/api/bluetooth/bluetooth_api.cc | 2 +- .../extensions/api/browsing_data/browsing_data_api.cc | 2 +- chrome/browser/extensions/api/commands/command_service.h | 2 +- chrome/browser/extensions/api/cookies/cookies_api.cc | 4 ++-- chrome/browser/extensions/api/cookies/cookies_helpers.cc | 4 ++-- chrome/browser/extensions/api/debugger/debugger_api.cc | 2 +- .../extensions/api/declarative/declarative_apitest.cc | 2 +- .../browser/extensions/api/declarative/declarative_rule.h | 2 +- chrome/browser/extensions/api/declarative/rules_registry.cc | 2 +- .../extensions/api/declarative/rules_registry_service.cc | 2 +- .../api/declarative/rules_registry_with_cache_unittest.cc | 2 +- .../extensions/api/declarative_content/content_action.cc | 2 +- .../api/declarative_webrequest/webrequest_action.cc | 2 +- .../declarative_webrequest/webrequest_action_unittest.cc | 2 +- .../api/declarative_webrequest/webrequest_rules_registry.cc | 4 ++-- chrome/browser/extensions/api/downloads/downloads_api.cc | 4 ++-- .../api/extension_action/browser_action_interactive_test.cc | 2 +- .../api/extension_action/extension_action_prefs_unittest.cc | 2 +- .../extension_browser_actions_api_unittest.cc | 4 ++-- .../extensions/api/extension_action/page_action_apitest.cc | 2 +- .../api/extension_action/page_as_browser_action_apitest.cc | 2 +- .../extensions/api/extension_action/script_badge_apitest.cc | 2 +- .../extensions/api/file_handlers/app_file_handler_util.h | 2 +- chrome/browser/extensions/api/i18n/i18n_apitest.cc | 2 +- .../extensions/api/identity/experimental_identity_api.cc | 2 +- chrome/browser/extensions/api/identity/identity_api.cc | 2 +- chrome/browser/extensions/api/idle/idle_api_unittest.cc | 2 +- chrome/browser/extensions/api/idle/idle_manager.cc | 2 +- chrome/browser/extensions/api/input_ime/input_ime_api.h | 2 +- chrome/browser/extensions/api/location/location_manager.cc | 2 +- chrome/browser/extensions/api/management/management_api.cc | 4 ++-- .../extensions/api/media_galleries/media_galleries_api.cc | 4 ++-- .../media_galleries_private/gallery_watch_state_tracker.cc | 2 +- .../media_galleries_private_apitest.cc | 2 +- .../media_galleries_watch_apitest.cc | 2 +- .../extensions/api/messaging/incognito_connectability.cc | 2 +- chrome/browser/extensions/api/messaging/message_service.cc | 3 +-- .../api/messaging/native_message_process_host_unittest.cc | 2 +- .../extensions/api/metrics_private/metrics_private_api.cc | 2 +- .../extensions/api/notifications/notifications_api.cc | 2 +- chrome/browser/extensions/api/omnibox/omnibox_api.cc | 2 +- .../browser/extensions/api/permissions/permissions_api.cc | 4 ++-- .../extensions/api/permissions/permissions_api_helpers.cc | 2 +- chrome/browser/extensions/api/power/power_api_manager.cc | 2 +- chrome/browser/extensions/api/power/power_api_unittest.cc | 2 +- .../api/preference/preference_api_prefs_unittest.cc | 2 +- chrome/browser/extensions/api/proxy/proxy_apitest.cc | 2 +- .../extensions/api/push_messaging/push_messaging_api.cc | 2 +- .../push_messaging/push_messaging_invalidation_handler.cc | 2 +- chrome/browser/extensions/api/runtime/runtime_api.cc | 2 +- .../extensions/api/signed_in_devices/id_mapping_helper.cc | 2 +- .../api/signed_in_devices/signed_in_devices_api_unittest.cc | 2 +- .../api/signed_in_devices/signed_in_devices_manager.cc | 2 +- chrome/browser/extensions/api/socket/socket_api.cc | 4 ++-- .../api/sockets_tcp_server/sockets_tcp_server_api.cc | 2 +- .../extensions/api/storage/managed_value_store_cache.cc | 2 +- chrome/browser/extensions/api/storage/settings_test_util.cc | 4 ++-- chrome/browser/extensions/api/storage/settings_test_util.h | 2 +- .../api/storage/sync_or_local_value_store_cache.cc | 2 +- .../extensions/api/streams_private/streams_private_api.h | 2 +- .../api/system_indicator/system_indicator_apitest.cc | 2 +- .../api/system_indicator/system_indicator_manager.cc | 2 +- .../api/system_storage/system_storage_eject_apitest.cc | 2 +- .../browser/extensions/api/tab_capture/tab_capture_api.cc | 2 +- .../extensions/api/tab_capture/tab_capture_registry.cc | 2 +- chrome/browser/extensions/api/tabs/ash_panel_contents.cc | 2 +- chrome/browser/extensions/api/tabs/tabs_api.cc | 4 ++-- .../extensions/api/terminal/terminal_extension_helper.cc | 2 +- chrome/browser/extensions/api/usb/usb_api.cc | 2 +- .../browser/extensions/api/web_request/web_request_api.cc | 4 ++-- .../extensions/api/web_request/web_request_permissions.cc | 4 ++-- .../webrtc_audio_private_browsertest.cc | 2 +- .../extensions/api/webstore_private/webstore_private_api.cc | 2 +- chrome/browser/extensions/app_background_page_apitest.cc | 2 +- chrome/browser/extensions/app_icon_loader_impl.cc | 2 +- chrome/browser/extensions/app_process_apitest.cc | 2 +- chrome/browser/extensions/app_sync_bundle.cc | 2 +- chrome/browser/extensions/app_sync_data.cc | 2 +- .../extensions/browser_extension_window_controller.cc | 2 +- .../extensions/browser_permissions_policy_delegate.h | 2 +- .../browser_permissions_policy_delegate_unittest.cc | 4 ++-- chrome/browser/extensions/bundle_installer.cc | 4 ++-- chrome/browser/extensions/bundle_installer.h | 2 +- chrome/browser/extensions/chrome_app_api_browsertest.cc | 2 +- chrome/browser/extensions/component_loader.cc | 2 +- chrome/browser/extensions/component_loader_unittest.cc | 2 +- chrome/browser/extensions/content_script_apitest.cc | 2 +- chrome/browser/extensions/convert_user_script.cc | 2 +- chrome/browser/extensions/convert_user_script_unittest.cc | 2 +- chrome/browser/extensions/convert_web_app.cc | 2 +- chrome/browser/extensions/convert_web_app_browsertest.cc | 2 +- chrome/browser/extensions/convert_web_app_unittest.cc | 2 +- chrome/browser/extensions/crx_installer.cc | 2 +- chrome/browser/extensions/crx_installer.h | 2 +- chrome/browser/extensions/crx_installer_browsertest.cc | 2 +- chrome/browser/extensions/data_deleter.cc | 2 +- chrome/browser/extensions/default_apps.cc | 6 +++--- chrome/browser/extensions/default_apps_unittest.cc | 2 +- chrome/browser/extensions/devtools_util.cc | 2 +- chrome/browser/extensions/error_console/error_console.cc | 2 +- .../extensions/error_console/error_console_browsertest.cc | 2 +- chrome/browser/extensions/event_router.cc | 2 +- chrome/browser/extensions/extension_action_icon_factory.cc | 2 +- .../extensions/extension_action_icon_factory_unittest.cc | 2 +- chrome/browser/extensions/extension_action_manager.cc | 2 +- chrome/browser/extensions/extension_apitest.cc | 4 ++-- chrome/browser/extensions/extension_browsertest.h | 2 +- .../extensions/extension_commands_global_registry.cc | 2 +- chrome/browser/extensions/extension_context_menu_model.cc | 2 +- chrome/browser/extensions/extension_creator.cc | 2 +- chrome/browser/extensions/extension_disabled_ui.cc | 2 +- .../browser/extensions/extension_disabled_ui_browsertest.cc | 2 +- chrome/browser/extensions/extension_error_ui.h | 2 +- chrome/browser/extensions/extension_error_ui_default.h | 2 +- chrome/browser/extensions/extension_function_test_utils.cc | 2 +- chrome/browser/extensions/extension_host.cc | 2 +- chrome/browser/extensions/extension_icon_image.cc | 2 +- chrome/browser/extensions/extension_icon_image_unittest.cc | 2 +- chrome/browser/extensions/extension_icon_manager.cc | 2 +- .../browser/extensions/extension_icon_manager_unittest.cc | 2 +- chrome/browser/extensions/extension_infobar_delegate.cc | 2 +- chrome/browser/extensions/extension_install_prompt.cc | 4 ++-- chrome/browser/extensions/extension_installer.h | 2 +- chrome/browser/extensions/extension_keybinding_apitest.cc | 4 ++-- .../browser/extensions/extension_notification_observer.cc | 2 +- chrome/browser/extensions/extension_prefs.h | 2 +- chrome/browser/extensions/extension_protocols.cc | 2 +- chrome/browser/extensions/extension_protocols_unittest.cc | 2 +- chrome/browser/extensions/extension_service.cc | 4 ++-- chrome/browser/extensions/extension_service.h | 2 +- chrome/browser/extensions/extension_service_unittest.cc | 2 +- chrome/browser/extensions/extension_sorting.cc | 2 +- chrome/browser/extensions/extension_sorting.h | 2 +- .../browser/extensions/extension_special_storage_policy.cc | 2 +- .../extensions/extension_special_storage_policy_unittest.cc | 2 +- chrome/browser/extensions/extension_sync_bundle.cc | 2 +- chrome/browser/extensions/extension_sync_data.cc | 2 +- chrome/browser/extensions/extension_sync_service.cc | 2 +- chrome/browser/extensions/extension_sync_service.h | 2 +- chrome/browser/extensions/extension_system.cc | 2 +- chrome/browser/extensions/extension_system.h | 2 +- chrome/browser/extensions/extension_tab_util.cc | 4 ++-- .../extensions/extension_test_notification_observer.cc | 2 +- chrome/browser/extensions/extension_toolbar_model.cc | 2 +- chrome/browser/extensions/extension_toolbar_model.h | 2 +- chrome/browser/extensions/extension_ui_unittest.cc | 2 +- chrome/browser/extensions/extension_uninstall_dialog.cc | 2 +- chrome/browser/extensions/extension_util.cc | 2 +- chrome/browser/extensions/extension_warning_service.cc | 3 +-- chrome/browser/extensions/extension_warning_set.cc | 2 +- chrome/browser/extensions/extension_web_ui.cc | 2 +- chrome/browser/extensions/extension_webkit_preferences.cc | 2 +- chrome/browser/extensions/external_install_ui.cc | 2 +- .../browser/extensions/external_policy_loader_unittest.cc | 2 +- chrome/browser/extensions/external_provider_impl.cc | 2 +- chrome/browser/extensions/external_registry_loader_win.cc | 2 +- chrome/browser/extensions/image_loader.cc | 2 +- chrome/browser/extensions/image_loader_unittest.cc | 2 +- chrome/browser/extensions/install_signer.h | 2 +- chrome/browser/extensions/install_verifier.h | 2 +- chrome/browser/extensions/installed_loader.cc | 2 +- chrome/browser/extensions/lazy_background_page_apitest.cc | 2 +- chrome/browser/extensions/management_policy.h | 2 +- chrome/browser/extensions/menu_manager.cc | 2 +- chrome/browser/extensions/menu_manager_unittest.cc | 2 +- chrome/browser/extensions/notifications_apitest.cc | 2 +- chrome/browser/extensions/options_page_apitest.cc | 2 +- chrome/browser/extensions/page_action_browsertest.cc | 2 +- .../browser/extensions/page_action_controller_unittest.cc | 2 +- chrome/browser/extensions/pending_extension_info.h | 2 +- chrome/browser/extensions/pending_extension_manager.h | 2 +- chrome/browser/extensions/permissions_updater.cc | 4 ++-- chrome/browser/extensions/permissions_updater_unittest.cc | 2 +- chrome/browser/extensions/plugin_apitest.cc | 2 +- chrome/browser/extensions/plugin_manager.cc | 2 +- chrome/browser/extensions/policy_handlers.cc | 2 +- chrome/browser/extensions/requirements_checker.cc | 2 +- .../browser/extensions/requirements_checker_browsertest.cc | 2 +- chrome/browser/extensions/sandboxed_unpacker.cc | 2 +- chrome/browser/extensions/sandboxed_unpacker_unittest.cc | 2 +- chrome/browser/extensions/script_badge_controller.cc | 2 +- .../browser/extensions/script_badge_controller_unittest.cc | 2 +- chrome/browser/extensions/script_bubble_controller.cc | 2 +- .../browser/extensions/script_bubble_controller_unittest.cc | 2 +- .../extensions/standard_management_policy_provider.cc | 2 +- chrome/browser/extensions/startup_helper.cc | 2 +- chrome/browser/extensions/state_store.cc | 2 +- .../browser/extensions/subscribe_page_action_browsertest.cc | 2 +- chrome/browser/extensions/suggest_permission_util.cc | 2 +- chrome/browser/extensions/tab_helper.cc | 2 +- chrome/browser/extensions/test_extension_environment.cc | 2 +- chrome/browser/extensions/test_extension_prefs.cc | 2 +- .../browser/extensions/theme_installed_infobar_delegate.cc | 2 +- chrome/browser/extensions/unpacked_installer.cc | 2 +- chrome/browser/extensions/updater/extension_downloader.h | 2 +- chrome/browser/extensions/updater/extension_updater.cc | 2 +- .../extensions/updater/extension_updater_unittest.cc | 2 +- chrome/browser/extensions/user_script_listener.cc | 2 +- chrome/browser/extensions/user_script_master.cc | 2 +- chrome/browser/extensions/webstore_ephemeral_installer.cc | 2 +- chrome/browser/extensions/webstore_installer.cc | 2 +- chrome/browser/extensions/webstore_standalone_installer.cc | 2 +- chrome/browser/extensions/window_open_apitest.cc | 2 +- .../geolocation/chrome_geolocation_permission_context.cc | 2 +- chrome/browser/history/shortcuts_backend.cc | 2 +- chrome/browser/infobars/infobar_extension_api.cc | 2 +- chrome/browser/managed_mode/managed_mode_site_list.cc | 2 +- .../browser/managed_mode/managed_user_service_unittest.cc | 2 +- chrome/browser/media/media_capture_devices_dispatcher.cc | 2 +- chrome/browser/media/media_stream_capture_indicator.cc | 2 +- .../media/protected_media_identifier_permission_context.cc | 2 +- .../browser/media_galleries/media_file_system_registry.cc | 2 +- .../media_galleries/media_file_system_registry_unittest.cc | 2 +- .../media_galleries/media_galleries_dialog_controller.cc | 4 ++-- .../browser/media_galleries/media_galleries_preferences.cc | 4 ++-- .../media_galleries/media_galleries_preferences_unittest.cc | 2 +- chrome/browser/media_galleries/media_galleries_test_util.cc | 2 +- chrome/browser/memory_details.cc | 2 +- chrome/browser/nacl_host/nacl_browser_delegate_impl.cc | 2 +- .../notifications/notification_options_menu_model.cc | 2 +- .../browser/notifications/notification_system_observer.cc | 2 +- chrome/browser/performance_monitor/database_unittest.cc | 2 +- chrome/browser/performance_monitor/performance_monitor.cc | 2 +- .../performance_monitor/performance_monitor_browsertest.cc | 2 +- .../policy/cloud/component_cloud_policy_browsertest.cc | 2 +- chrome/browser/policy/policy_browsertest.cc | 2 +- .../browser/profile_resetter/brandcoded_default_settings.cc | 2 +- .../browser/profile_resetter/profile_resetter_unittest.cc | 2 +- chrome/browser/profiles/off_the_record_profile_impl.cc | 2 +- chrome/browser/profiles/off_the_record_profile_io_data.cc | 2 +- .../pepper/pepper_isolated_file_system_message_filter.cc | 2 +- .../browser/search_engines/template_url_service_unittest.cc | 2 +- chrome/browser/sessions/session_service.cc | 2 +- chrome/browser/sessions/tab_restore_service_helper.cc | 4 ++-- .../speech/extension_api/tts_engine_extension_api.cc | 2 +- chrome/browser/speech/tts_controller.cc | 2 +- chrome/browser/sync/glue/extensions_activity_monitor.cc | 2 +- .../sync/glue/extensions_activity_monitor_unittest.cc | 2 +- chrome/browser/sync/glue/synced_tab_delegate_android.cc | 2 +- .../sync/test/integration/extension_settings_helper.cc | 2 +- .../browser/sync/test/integration/sync_extension_helper.cc | 2 +- chrome/browser/sync/test/integration/themes_helper.cc | 2 +- .../drive_backend/remote_to_local_syncer.cc | 2 +- .../sync_file_system/drive_backend/sync_engine_unittest.cc | 2 +- .../browser/sync_file_system/drive_backend_v1/api_util.cc | 2 +- .../drive_backend_v1/drive_file_sync_service.cc | 2 +- .../drive_file_sync_service_fake_unittest.cc | 2 +- chrome/browser/sync_file_system/sync_file_system_service.cc | 2 +- chrome/browser/tab_contents/render_view_context_menu.cc | 2 +- chrome/browser/task_manager/background_resource_provider.cc | 2 +- .../task_manager/extension_process_resource_provider.cc | 2 +- chrome/browser/task_manager/panel_resource_provider.cc | 2 +- chrome/browser/task_manager/task_manager_browsertest.cc | 2 +- chrome/browser/themes/browser_theme_pack.h | 2 +- chrome/browser/themes/theme_service_unittest.cc | 2 +- chrome/browser/themes/theme_syncable_service.cc | 2 +- chrome/browser/themes/theme_syncable_service_unittest.cc | 2 +- chrome/browser/ui/app_list/app_list_controller_delegate.cc | 2 +- .../ui/app_list/app_list_controller_delegate_impl.cc | 2 +- chrome/browser/ui/app_list/extension_app_item.cc | 2 +- chrome/browser/ui/app_list/extension_app_model_builder.cc | 2 +- chrome/browser/ui/app_list/extension_uninstaller.cc | 2 +- chrome/browser/ui/app_list/recommended_apps.cc | 2 +- chrome/browser/ui/app_list/search/app_result.cc | 2 +- .../browser/ui/app_list/search/webstore/webstore_result.cc | 2 +- chrome/browser/ui/app_list/start_page_service.cc | 2 +- .../browser/ui/ash/launcher/chrome_launcher_controller.cc | 2 +- .../ui/ash/launcher/chrome_launcher_controller_unittest.cc | 2 +- chrome/browser/ui/ash/launcher/launcher_app_tab_helper.cc | 2 +- chrome/browser/ui/ash/launcher/launcher_item_controller.cc | 2 +- chrome/browser/ui/browser.cc | 2 +- chrome/browser/ui/browser_browsertest.cc | 2 +- chrome/browser/ui/browser_navigator.cc | 2 +- .../browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm | 2 +- .../cocoa/apps/app_shim_menu_controller_mac_browsertest.mm | 2 +- chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm | 2 +- chrome/browser/ui/cocoa/extensions/browser_action_button.mm | 2 +- .../extensions/extension_action_context_menu_controller.mm | 2 +- .../extension_action_context_menu_controller_browsertest.mm | 2 +- .../extension_install_dialog_controller_browsertest.mm | 2 +- .../cocoa/extensions/extension_install_prompt_test_utils.mm | 2 +- .../cocoa/extensions/extension_install_view_controller.mm | 2 +- .../extension_install_view_controller_unittest.mm | 2 +- .../cocoa/extensions/extension_installed_bubble_bridge.mm | 2 +- .../extensions/extension_installed_bubble_controller.mm | 2 +- .../extension_installed_bubble_controller_unittest.mm | 4 ++-- .../cocoa/extensions/extension_keybinding_registry_cocoa.mm | 2 +- .../ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm | 2 +- .../extensions/media_galleries_dialog_cocoa_browsertest.mm | 2 +- .../extensions/media_galleries_dialog_cocoa_unittest.mm | 2 +- .../ui/cocoa/infobars/extension_infobar_controller.mm | 2 +- .../browser/ui/cocoa/location_bar/location_bar_view_mac.mm | 4 ++-- chrome/browser/ui/cocoa/tabs/tab_controller.mm | 2 +- chrome/browser/ui/extensions/application_launch.cc | 2 +- .../browser/ui/extensions/extension_install_ui_default.cc | 2 +- chrome/browser/ui/extensions/extension_installed_bubble.cc | 2 +- chrome/browser/ui/fullscreen/fullscreen_controller.cc | 2 +- chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc | 2 +- chrome/browser/ui/gtk/apps/native_app_window_gtk.cc | 2 +- chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc | 2 +- .../ui/gtk/create_application_shortcuts_dialog_gtk.cc | 2 +- .../ui/gtk/extensions/extension_install_dialog_gtk.cc | 2 +- .../ui/gtk/extensions/extension_installed_bubble_gtk.cc | 2 +- .../ui/gtk/extensions/extension_keybinding_registry_gtk.cc | 2 +- .../ui/gtk/extensions/extension_uninstall_dialog_gtk.cc | 2 +- .../gtk/extensions/media_galleries_dialog_gtk_unittest.cc | 2 +- chrome/browser/ui/gtk/gtk_theme_service.cc | 2 +- chrome/browser/ui/gtk/infobars/extension_infobar_gtk.cc | 2 +- chrome/browser/ui/gtk/location_bar_view_gtk.cc | 2 +- chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc | 2 +- chrome/browser/ui/gtk/script_bubble_gtk.cc | 2 +- chrome/browser/ui/panels/base_panel_browser_test.h | 2 +- chrome/browser/ui/panels/panel.cc | 2 +- chrome/browser/ui/panels/panel_extension_browsertest.cc | 2 +- chrome/browser/ui/panels/stacked_panel_collection.cc | 2 +- .../browser/ui/sync/profile_signin_confirmation_helper.cc | 2 +- .../ui/sync/profile_signin_confirmation_helper_unittest.cc | 2 +- chrome/browser/ui/sync/tab_contents_synced_tab_delegate.cc | 2 +- chrome/browser/ui/tabs/pinned_tab_codec.cc | 2 +- chrome/browser/ui/tabs/tab_strip_model_unittest.cc | 2 +- chrome/browser/ui/views/apps/native_app_window_views.cc | 2 +- chrome/browser/ui/views/apps/native_app_window_views_win.cc | 2 +- chrome/browser/ui/views/browser_action_view.cc | 2 +- chrome/browser/ui/views/create_application_shortcut_view.cc | 2 +- .../extensions/browser_action_overflow_menu_controller.cc | 2 +- .../ui/views/extensions/extension_install_dialog_view.cc | 2 +- .../ui/views/extensions/extension_installed_bubble_view.cc | 2 +- .../views/extensions/extension_keybinding_registry_views.cc | 2 +- .../ui/views/extensions/extension_uninstall_dialog_view.cc | 2 +- chrome/browser/ui/views/infobars/extension_infobar.cc | 2 +- .../browser/ui/views/location_bar/page_action_image_view.cc | 2 +- chrome/browser/ui/views/script_bubble_view.cc | 2 +- chrome/browser/ui/web_applications/web_app_ui.cc | 2 +- chrome/browser/ui/webui/app_list/start_page_handler.cc | 2 +- .../ui/webui/extensions/chromeos/kiosk_apps_handler.cc | 2 +- chrome/browser/ui/webui/extensions/extension_basic_info.cc | 2 +- .../browser/ui/webui/extensions/extension_error_handler.cc | 2 +- chrome/browser/ui/webui/extensions/extension_icon_source.cc | 2 +- chrome/browser/ui/webui/extensions/extension_info_ui.cc | 2 +- .../ui/webui/extensions/extension_settings_browsertest.h | 2 +- .../ui/webui/extensions/extension_settings_handler.cc | 2 +- chrome/browser/ui/webui/ntp/app_launcher_handler.cc | 2 +- chrome/browser/ui/webui/ntp/app_launcher_handler.h | 2 +- chrome/browser/ui/webui/ntp/core_app_launcher_handler.cc | 2 +- chrome/browser/ui/webui/ntp/core_app_launcher_handler.h | 2 +- chrome/browser/ui/webui/ntp/ntp_resource_cache.cc | 2 +- chrome/browser/ui/webui/options/core_options_handler.cc | 2 +- chrome/browser/ui/webui/options/font_settings_handler.cc | 2 +- .../ui/webui/options/search_engine_manager_handler.cc | 2 +- chrome/browser/ui/webui/policy_ui.cc | 2 +- .../extension_statuses_handler.cc | 2 +- .../sync_file_system_internals/file_metadata_handler.cc | 2 +- chrome/browser/web_applications/web_app.cc | 2 +- chrome/browser/web_applications/web_app_mac.mm | 4 ++-- chrome/chrome_common.gypi | 4 ---- chrome/chrome_tests_unit.gypi | 2 +- chrome/common/extensions/api/commands/commands_handler.h | 2 +- .../common/extensions/api/extension_action/action_info.cc | 2 +- chrome/common/extensions/api/extension_action/action_info.h | 2 +- .../api/extension_action/browser_action_handler.cc | 2 +- .../api/extension_action/browser_action_handler.h | 2 +- .../extensions/api/extension_action/page_action_handler.cc | 2 +- .../extensions/api/extension_action/page_action_handler.h | 2 +- .../api/extension_action/page_action_manifest_unittest.cc | 2 +- .../extensions/api/extension_action/script_badge_handler.cc | 2 +- .../extensions/api/extension_action/script_badge_handler.h | 2 +- chrome/common/extensions/api/extension_api_unittest.cc | 2 +- .../api/file_browser_handlers/file_browser_handler.h | 2 +- .../extensions/api/file_handlers/file_handlers_parser.h | 2 +- chrome/common/extensions/api/i18n/default_locale_handler.h | 2 +- .../extensions/api/identity/oauth2_manifest_handler.h | 2 +- .../extensions/api/input_ime/input_components_handler.cc | 2 +- .../extensions/api/input_ime/input_components_handler.h | 2 +- .../api/managed_mode_private/managed_mode_handler.h | 2 +- .../api/media_galleries_private/media_galleries_handler.h | 2 +- chrome/common/extensions/api/omnibox/omnibox_handler.cc | 2 +- chrome/common/extensions/api/omnibox/omnibox_handler.h | 2 +- chrome/common/extensions/api/plugins/plugins_handler.cc | 2 +- chrome/common/extensions/api/plugins/plugins_handler.h | 2 +- .../common/extensions/api/sockets/sockets_manifest_data.h | 2 +- .../extensions/api/sockets/sockets_manifest_handler.cc | 2 +- .../extensions/api/speech/tts_engine_manifest_handler.h | 2 +- .../common/extensions/api/spellcheck/spellcheck_handler.h | 2 +- .../api/storage/storage_schema_manifest_handler.cc | 2 +- .../api/storage/storage_schema_manifest_handler_unittest.cc | 2 +- .../api/system_indicator/system_indicator_handler.cc | 4 ++-- .../api/system_indicator/system_indicator_handler.h | 2 +- .../extensions/api/url_handlers/url_handlers_parser.h | 2 +- chrome/common/extensions/chrome_extensions_client.cc | 2 +- chrome/common/extensions/command.cc | 2 +- chrome/common/extensions/csp_handler.h | 2 +- chrome/common/extensions/extension_file_util.cc | 2 +- chrome/common/extensions/extension_file_util_unittest.cc | 2 +- chrome/common/extensions/extension_messages.cc | 4 ++-- chrome/common/extensions/extension_messages.h | 2 +- chrome/common/extensions/extension_process_policy.cc | 2 +- chrome/common/extensions/extension_set.cc | 2 +- chrome/common/extensions/extension_set.h | 2 +- chrome/common/extensions/extension_set_unittest.cc | 2 +- chrome/common/extensions/extension_test_util.cc | 2 +- chrome/common/extensions/extension_unittest.cc | 4 ++-- chrome/common/extensions/features/complex_feature.h | 2 +- chrome/common/extensions/features/permission_feature.cc | 2 +- chrome/common/extensions/features/simple_feature.h | 2 +- chrome/common/extensions/manifest_handler_helpers.cc | 2 +- .../extensions/manifest_handlers/app_isolation_info.cc | 2 +- .../extensions/manifest_handlers/app_isolation_info.h | 2 +- .../common/extensions/manifest_handlers/app_launch_info.h | 2 +- .../extensions/manifest_handlers/content_scripts_handler.cc | 4 ++-- .../extensions/manifest_handlers/content_scripts_handler.h | 2 +- .../manifest_handlers/content_scripts_manifest_unittest.cc | 2 +- .../manifest_handlers/exclude_matches_manifest_unittest.cc | 2 +- .../extensions/manifest_handlers/externally_connectable.cc | 2 +- .../extensions/manifest_handlers/externally_connectable.h | 2 +- chrome/common/extensions/manifest_handlers/icons_handler.cc | 2 +- chrome/common/extensions/manifest_handlers/icons_handler.h | 2 +- .../common/extensions/manifest_handlers/kiosk_mode_info.h | 2 +- .../manifest_handlers/minimum_chrome_version_checker.cc | 2 +- .../extensions/manifest_handlers/nacl_modules_handler.h | 2 +- .../extensions/manifest_handlers/offline_enabled_info.h | 2 +- .../extensions/manifest_handlers/requirements_handler.h | 2 +- .../extensions/manifest_handlers/sandboxed_page_info.h | 2 +- .../manifest_handlers/settings_overrides_handler.cc | 2 +- .../manifest_handlers/settings_overrides_handler.h | 2 +- .../settings_overrides_handler_unittest.cc | 2 +- .../extensions/manifest_handlers/shared_module_info.h | 2 +- .../manifest_handlers/shared_module_manifest_unittest.cc | 2 +- chrome/common/extensions/manifest_handlers/theme_handler.h | 2 +- .../extensions/manifest_tests/extension_manifest_test.h | 2 +- .../extension_manifests_background_unittest.cc | 2 +- .../extension_manifests_chromepermission_unittest.cc | 4 ++-- .../extension_manifests_default_extent_path_unittest.cc | 2 +- .../manifest_tests/extension_manifests_devtools_unittest.cc | 4 ++-- .../extension_manifests_experimental_unittest.cc | 2 +- .../manifest_tests/extension_manifests_homepage_unittest.cc | 2 +- .../manifest_tests/extension_manifests_icons_unittest.cc | 2 +- .../extension_manifests_initvalue_unittest.cc | 2 +- .../extension_manifests_isolatedapp_unittest.cc | 2 +- .../manifest_tests/extension_manifests_kiosk_unittest.cc | 2 +- .../manifest_tests/extension_manifests_launch_unittest.cc | 2 +- .../manifest_tests/extension_manifests_offline_unittest.cc | 2 +- .../manifest_tests/extension_manifests_old_unittest.cc | 2 +- chrome/common/extensions/manifest_url_handler.cc | 2 +- chrome/common/extensions/manifest_url_handler.h | 2 +- chrome/common/extensions/mime_types_handler.h | 2 +- .../extensions/permissions/permission_set_unittest.cc | 4 ++-- .../permissions/settings_override_permission_unittest.cc | 2 +- chrome/common/extensions/sync_helper.cc | 2 +- chrome/common/extensions/sync_type_unittest.cc | 2 +- chrome/common/extensions/web_accessible_resources_handler.h | 2 +- chrome/common/extensions/webview_handler.h | 2 +- chrome/common/pepper_permission_util.cc | 2 +- chrome/renderer/chrome_content_renderer_client.cc | 2 +- chrome/renderer/chrome_content_renderer_client_unittest.cc | 2 +- chrome/renderer/extensions/chrome_v8_context.cc | 2 +- chrome/renderer/extensions/chrome_v8_context_set.cc | 2 +- .../renderer/extensions/chrome_v8_context_set_unittest.cc | 2 +- chrome/renderer/extensions/chrome_v8_extension.cc | 2 +- chrome/renderer/extensions/dispatcher.cc | 4 ++-- chrome/renderer/extensions/event_bindings.cc | 2 +- chrome/renderer/extensions/page_actions_custom_bindings.cc | 2 +- .../extensions/renderer_permissions_policy_delegate.h | 2 +- .../renderer_permissions_policy_delegate_unittest.cc | 4 ++-- chrome/renderer/extensions/resource_request_policy.cc | 2 +- chrome/renderer/extensions/runtime_custom_bindings.cc | 2 +- chrome/renderer/extensions/user_script_scheduler.cc | 2 +- chrome/renderer/extensions/user_script_slave.cc | 4 ++-- chrome/renderer/extensions/webstore_bindings.cc | 2 +- chrome/renderer/searchbox/searchbox_extension.cc | 2 +- chrome/test/base/chrome_render_view_test.cc | 4 ++-- chrome/test/perf/perf_ui_test_suite.cc | 2 +- chrome/test/remoting/remote_desktop_browsertest.cc | 2 +- chrome/utility/chrome_content_utility_client.cc | 2 +- chrome/utility/extensions/unpacker.cc | 2 +- chrome/utility/extensions/unpacker_unittest.cc | 2 +- extensions/DEPS | 6 ++++++ extensions/browser/DEPS | 1 - extensions/browser/admin_policy.cc | 2 +- extensions/browser/admin_policy_unittest.cc | 2 +- extensions/browser/extension_function.h | 2 +- extensions/browser/info_map.cc | 2 +- extensions/browser/info_map_unittest.cc | 2 +- extensions/browser/lazy_background_task_queue.cc | 2 +- extensions/browser/lazy_background_task_queue_unittest.cc | 2 +- extensions/browser/process_manager.cc | 2 +- extensions/common/DEPS | 4 ++-- .../common/extensions => extensions/common}/extension.cc | 6 ++---- {chrome/common/extensions => extensions/common}/extension.h | 6 +++--- extensions/common/extension_api.cc | 4 ++-- extensions/common/extension_builder.cc | 2 +- extensions/common/manifest_handler.cc | 2 +- extensions/common/manifest_handler_unittest.cc | 2 +- extensions/common/manifest_handlers/background_info.cc | 2 +- extensions/common/manifest_handlers/background_info.h | 2 +- extensions/common/manifest_handlers/incognito_info.cc | 2 +- extensions/common/manifest_handlers/incognito_info.h | 2 +- .../common}/permissions/permissions_data.cc | 5 ++--- .../common}/permissions/permissions_data.h | 6 +++--- .../common}/permissions/permissions_data_unittest.cc | 4 ++-- extensions/extensions.gyp | 4 ++++ 568 files changed, 627 insertions(+), 627 deletions(-) rename {chrome/common/extensions => extensions/common}/extension.cc (99%) rename {chrome/common/extensions => extensions/common}/extension.h (99%) rename {chrome/common/extensions => extensions/common}/permissions/permissions_data.cc (99%) rename {chrome/common/extensions => extensions/common}/permissions/permissions_data.h (97%) rename {chrome/common/extensions => extensions/common}/permissions/permissions_data_unittest.cc (99%) diff --git a/apps/app_lifetime_monitor.cc b/apps/app_lifetime_monitor.cc index e43fb6baa12e59..41d7f6b0f25f73 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 c4e24c328aba5e..afe99f835d6f23 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 e2d5a858f75643..524ab964780269 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 88f7dceac13765..27b179a502c31f 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 b6a156f6f44e9c..e4f5cb844b7553 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 9e0f6cf3f7ae56..220348ef5ab0c0 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 313c97cc683592..7a467ae048e7df 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 ed41645910a833..5e4098f504d51f 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 a3b0bcf036afb1..add42404c91a47 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 c44b924dddd89b..b72c1314dd19ec 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 641d9cbf27e184..4493a6f0f908f1 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 b50eea5620aec8..c72f982a631988 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 d95d139c860b2a..25d215365a02ae 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 4bd5f14ee9ed6c..e5cfc14099645c 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 c253fd16b569cf..080fa60f15d906 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 56f0fd095d5f2c..176e7471f8e41c 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 f384750348e0bb..3e9513d7d0adb8 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 fd6f12a62d4246..4385608fb113f0 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 bdd78e2b775905..8fa9e15ca86ab1 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 3d162eb00476f7..144ba6e283fe42 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 5668635241035f..b020e98b07d125 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 31302d8f85d8d9..0d950d6c7117dc 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 1bc7d2d565bf66..0dbc407704699a 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 a2a0b6d4303fba..ed0bc04c48227f 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 cee12d046cfe16..c305b92b95ff58 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 767fbec0561214..e6cc13386b31a3 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 d66b6a40940a99..d87377c57915a4 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 a5be498caf209c..8f69efbbe2a815 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 28865377a4bc4c..f51b612374c579 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 8326a8360baa7e..707700220a17b3 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 2532fdf02ae261..e484bb50ae505b 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 4aff6841923280..68021df8023726 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 27a70cd7113afd..56622753e4dbbe 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 edbc9a098a3511..657d1abd103167 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 56e5168e5121d7..8314d6b8d7cfc3 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 1765b6fee6571d..cf1c11db1c77ca 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 ffc3e93be38448..02a115e99a5148 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 5fac57caf921c3..5386cc77db9fca 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 0ebf0889663672..e97b6feaa4f977 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 193f26c60dfe1c..e4568636238508 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 ad45277a18141f..ba523b1c2e11d0 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 3838da23f420ba..3a31256259da53 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 2df016df447cda..2888d51b5afd03 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 1070b4a033107b..fd118815b006a1 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 0ff337af248908..0734cda8b189c0 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 1b43382a66f59e..f78a07abd3a089 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 887b04a8b496ab..7b8629e578fee1 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 8da1cdcf1f1d45..bfe145051aef31 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 fac15b23fbd216..472525b1cb84b1 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 22246741c3ac52..59f5d33cc63ad0 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 dd708d20f90204..6be4abcb058a53 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 a665db34487712..d1138d235f7e98 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 c16701b0d05dfa..ca8d0f8560c8a2 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 5b4b8f288e4ff1..d5ecd99e19aa9d 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 370b516c4b7ba8..3e91b924a3c850 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 aebeb39cc8eb20..dd4d3e67b8291f 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 67bde7a2411b74..150ba607c9a350 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 f7216eeb4ceac5..a71dd1cc26a3c0 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 a2563c6887c424..1a15030aac1fd1 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 e16241c757bd50..b6954af62ce8aa 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 f4d414384b0eb0..d6e478b3cd65e1 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 8d55c18f99b038..f8742b94d09772 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 b43227f4edb003..206900179615d1 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 2911cf3e129d09..f7d416782a4ee4 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 fab663af64ec2a..5596cfa759ae3f 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 725d8feb680d02..7ae4474fa85cef 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 2c8c1db91c3294..8feaa5c959769f 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 5ac5f861dc305e..994337c48ff009 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 b7fadfd957f817..af06d9ab51c3a7 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 70785256e2c5b4..573953b16a1bbf 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 82249844de2c9b..76aa309d733214 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 aec31178dcce3f..b26a9eab49d963 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 8ac599085102de..954bbe9002fd71 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 70cbce989e84d2..44769c1061d593 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 056f1533f1fb9a..713a14675b9c6a 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 84dffc21a80cbb..d51d7e24bcba97 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 e8b21745d5d041..c9949630becc76 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 abe3b247e6579c..1fd7e0cef90cc4 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 96f7efe46a8003..749c734ba71fdf 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 97ad637ef822e5..8a68573dd5ea74 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 14c2c8e22af09e..f95789215d0996 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 b2054cb67c6a67..2de1cc107f2b0b 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 4af14292534e3d..949796ef76e917 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 c6dbad59143f0f..fe2c10ef20e2c5 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 a1b0a3bf98073b..146010345d7e31 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 ab9a8652ecfe41..4c908eed2b441f 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 e6c2a4c04d9ba4..79e99ad2869380 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 f2d0078d079d7a..144d3bc89845ff 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 0363c5c77c5a4c..0e186b2cb5a29f 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 928090817e7586..bb4e44b6f87a1d 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 a2ab82bd8c53d0..203354bb432fce 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 #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 e6863f60ef6c69..f6f1ce849918ed 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 84cea40c555130..ef958013dff0ac 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 1850ab0f96a74e..5955853f5b8c5d 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 012ef6d54aefdc..331e0b89fbc5e0 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 0f4b4653a76252..461bca1f7311f1 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 e1c2d25bbca757..139be81828a85a 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 d07591c5087a7e..5cd2290524f98e 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 94001d4e1af576..28b3bdcd3e47c4 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 cc24391df40670..8a4f97eb262042 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 2aae953b5d851e..ea1cc2036eff67 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 79edf1fa7cc86f..04612b6c356cd9 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 144720385963f4..333ab5f7cff185 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 eca7bd22a94b1b..d9f41c644a91bb 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 f8b98ddf306ef0..23cf172c4daf91 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 dd36d8cb796bfc..749a790b2e76c1 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 fe4a35030a7828..89d1d9d40e5c39 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 0d4f643c333e41..64af8b07f5845b 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 e19b377ded8f9c..3e973824dea654 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 e5ac3aa1b604b0..3d505939604ded 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 2b90287e8d5669..2991d79d2d4fbb 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 849989e3e6f061..89c5970c5468fb 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 2014b48cfb5be4..37767a1cfa039c 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 0fece84946caf0..4f266066857640 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 a05e71a27587e6..404444d524487f 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 0a141a57a8c800..c77f6673c6eb21 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 fe20842450f244..b8b81e0fbcfdf7 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 682c1f466e6504..931bd9ff953a5b 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 c82dcbf21928b0..e0b564d527f7b7 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 580100ddbdd2ea..c8367839e80d65 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 927581753faf67..9d5e450af0e056 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 77d18efc142833..da173c2952ae87 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 e914a5ac1b2989..23dc3aa70f4b5a 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 a4619dbedc57a8..9468fa5e652c37 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 82c1845fb82b63..262a3e181c980b 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 73b660aefa3cf3..e801dd1e9e2c13 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 dd345376c38ddc..f26bc2eeba5777 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 ffa3abf16a937e..ec784455b98c7d 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 b8bdaf2819e1cf..a27314d2c3e0c4 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 a8b344d6dd1b96..b68bcc4f2f03bc 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 8e67fe63021f12..fe431cd7835419 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 b65ebc42d8dd9d..8f9cd6eed2bc1e 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 8d6e80e3669f13..a819b375208d6d 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 44e441ce371ee3..408f29f6f7c3b6 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 94a04c5d4a6e20..1d80bb4476c679 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 6c213c2ebc0431..a067edbf09844e 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 206c0197e91a78..21b81566b590b3 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 477592b34b95fd..900aee94c810b3 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 93430fb739d037..2f3e798c95a08a 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 5aa9fa1939196d..845f72bae6bf1d 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 3c664aae23f856..6ac157143a85c5 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 30df4cea0d0032..aa14346a7dce37 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 1172b2b83f4bed..879033d750e81f 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 ee724eb2409db0..6f12316021229f 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 69ec44b6cdd8d3..d14665eb910884 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 cb462ed3617f8f..f3a817d4bb6948 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 8bc66bfff11e0a..0c11941343fe7c 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 72f59fde0a559c..1ef1e429d462a0 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 6174b6e6df1026..401ac5c40bb794 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 3bd45c0c2b2c19..4f5f7e3b841bc5 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 5526bc7e8bf5d4..492490c53fe3db 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 1c5e417e73207b..da09d3367c1fbd 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 6a4694caa7d4fc..17f92789083c3b 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 d443ebf50dd9ae..64f67d856556d0 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 55d7531117b4ec..3f788dd8c5bf02 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 b3149694700e33..ef29c3ba7f4f1a 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 e1d4be183638f1..d0e5e95a3e7133 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 85326e34d69de6..155181d583a28d 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 7a70af61668270..d83418734d6c4a 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 936ed454270d73..f2e550d8cb5be9 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 cbf1715d0e4d7f..c79a68772b2011 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 6d55481e8aeae6..b213a3f6a05327 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 29f645a27f7d67..3e5bd6f1fea188 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 8d53a42369c845..c0947f8722e608 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 73fc05d778a78d..4d01de3d87dee2 100644 --- a/chrome/browser/extensions/default_apps.cc +++ b/chrome/browser/extensions/default_apps.cc @@ -8,15 +8,15 @@ #include #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 1f16f2d6756f38..1032d375da5526 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 5b35dfdd36cd55..21e5fe8a02cd7e 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 47352f9054aa9b..9f4c7bef6ae309 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 34514e916b7baa..ed6f3b48454013 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 fdf4c3fc2e1b74..f0eba31451a58d 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 cbffbbcc1dcaec..0e40e65fc42045 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 649ac620793929..e8816bbc0b0f11 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 d3e036ea16bd3b..d010b9f6d11a36 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 0df5462e6ba081..47cf2df3a7a5d7 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 9acc3a3f0075eb..f70537c10d7377 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 a7ebd898adb45e..893924a75c92ac 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 43f8e076148f61..96f568f9688107 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 61d4a4ab8c2f24..be9ac61f7e62eb 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 6a509cdb1b999c..4a5c3d9fedab2c 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 5dede6a49fb1d8..5c6e7fc5c509cb 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 f0faef22e46fef..d70fa1aa67a562 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 6861d5625d4de0..dab1444c607ea8 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 cf16bd1a60830b..df91ad036c3ea1 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 4a356ace1a1c97..f312a957379073 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 6c0b4b37bfa4c3..625bb01f13ad40 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 fd35ee9b4bf888..da1e354c58b750 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 e247da347fcd13..422ed8fdea12a7 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 287f98b3eca27f..8fcf7f9771b0d5 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 66e3f09533c77c..95bb6540118b6f 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 b3c02a49222b02..198df6688b4a35 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 9e05c6a746f626..13170cbbe337c8 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 7028633c7f5e87..136910f71c55a9 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 b06c0bbe4ea3e9..8447d1570cb9f8 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 081eb669300d13..5646248cdddb5d 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 13824e4db37806..573c98ac3aff9a 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 0bfa1d74ea4621..9d954613c61c7c 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 f9dafbdf38f1ab..c636c14573c626 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 f68fe2572c8aa4..a4d82584477b46 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 67695c6facfb38..d7307763dfc1c0 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 fc44114832234e..1d5edcb4e58484 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 ea45fa4aebfe7e..5c02d4aa46d06c 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 4d05765683a701..8cf296d638f158 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 6b23aa8f89d72c..71ef27f9afa4b2 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 a43963de0e52b9..ab133b58cb71f9 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 acef30edeee4b1..2371867f51a7fe 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 2d81effa3b9222..670c73d4a062a2 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 65559e9983f9cd..81c6a5bff3b3c5 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 bb18b076958fea..96f4b87adb7915 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 a96cfebe736588..fa5e1a645a53a3 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 9fd5ec068b312e..fcba218d5a041c 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 c9f22ef7cc1ab9..94ad1ff4a91ba0 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 612036b6065bcd..8cc820ca34cd93 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 7f88f67b02bd72..d739ce347cffe3 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 d856cf19838db2..a7e88b964a27ad 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 317ddac9bfbe46..3020c04f686daa 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 b5a03f643f7590..1192a0da9fad1a 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 d59c76ef66db1d..af2f3b85b5dd02 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 67e90a34db3c53..c61a0de62d5ccc 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 db08d9681702d0..34ac503d89db07 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 09673f31b19f05..0455227428744e 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 75c6974b0da0b7..b5ac233f60b4b5 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 4fe89edbbb8996..067c38d6eebd10 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 67ef13aae734b4..9312501f1f8a5a 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 cf446c0ee98c9f..599b0cdd3cc1c4 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 ee2567f4cb2aa4..dc6a42a10aebd0 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 a8f0d155d626ca..9b444b13160d22 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 b110bef7baf24c..6fd89533c3beff 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 eb5d17c2f06f7d..1c455304198ba3 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 6700cba6981b6b..b037c0d6c2d86b 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 296f3aa02d3c68..e0873193fa3cc5 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 5a1de2c1154e3a..1aafc41ebd9ee6 100644 --- a/chrome/browser/extensions/management_policy.h +++ b/chrome/browser/extensions/management_policy.h @@ -9,7 +9,7 @@ #include #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 f0bb54fd4dfbff..ac88df80bca78e 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 d9df606fc3fe9c..aaeb46eacbe77b 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 b86ffd0485240b..6b0a2bacb2cb6c 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 8e9cf54dad30cc..be010f9a7c3dd4 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 921b333d75b0b6..39b58bc591c463 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 7b8cddc0d2ddb6..d715e5c50efb9b 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 b1ee8fe280c65c..0ce46a8572f264 100644 --- a/chrome/browser/extensions/pending_extension_info.h +++ b/chrome/browser/extensions/pending_extension_info.h @@ -8,7 +8,7 @@ #include #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 44a99c91789dfb..cc98f55b61798b 100644 --- a/chrome/browser/extensions/pending_extension_manager.h +++ b/chrome/browser/extensions/pending_extension_manager.h @@ -9,7 +9,7 @@ #include #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 1e38cb8d525322..6fdd75837c9320 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 7a0e4318f48206..78b9a89df59557 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 c74a58e1f798c6..0d864291ed1998 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 ff77620a0e4c9e..98a67b6bf24da0 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 263772623692d1..5b80cc35e3281c 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 f1a5417b5209f1..7a6103350933b7 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 73bbfbd2a1ff82..6378424e2e157f 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 6832bfd5c95794..6dd89c9bf1126a 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 7428cba7a68bdd..5f7e6735c725ed 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 72dbfeec354218..d701652d54e211 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 f55f5c28dd2393..0eab0f5d79d4fd 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 a47d24a71fa01c..7ea4e0f15f7357 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 d3876aac5c10b2..4c39776bee2625 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 2bdaa946719531..ae51540b7e9d80 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 0362c9598ba520..6277e5d3267923 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 bf3d4f8c87e099..a12dc514bbf295 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 4c6d950ffb4f84..fd370750636829 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 7eb1e10ddda771..f5b68b8e1cac6e 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 9c9cf0ae12a897..1ce6228c3e6edd 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 805ea2d428882a..dd3fa44a2a5634 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 d525c0701800b2..6118f617688e4e 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 be6ede82d85eb5..11766fad88ded7 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 13db0f544e3644..52de886631aa50 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 c6cd8268a3b650..3a5cbc9083d173 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 aa3fc4bb04e014..9d457129ca371d 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 c917e279f92803..d7e963fb4ad91f 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 1e2c5871d1a880..b04b32634b7ed2 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 4a9ff1ca019c90..3c3dc69add5e3b 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 31f7a04a8b8378..0dc0ad28dd0d23 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 d4c9c2f0e3ddb7..cdcf3763cba049 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 9f13c3cc5cec2d..7ee425dbd4735e 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 81a9c3f5230660..80466511dd11a0 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 606344214453c6..6f6d9b66a080f2 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 27dbae9a4d6c35..3fba50ec822585 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 fc2d9ad8d45645..7b91f24fa21d55 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 977a23ea74d0b2..2689cab5344966 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 d13b5b16c03365..d434c1f0d8b339 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 9c190648f3ba96..d0fdc07438da68 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 6a375d37b8b55a..0312f85feba4db 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 258d8179bbd39e..e56b41a8c47922 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 0dcd520f2907fd..e971288007789b 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 a122bf5e55479f..09912b0fe348b4 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 b40907892579ce..af69c38ece22e6 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 e6671fc8984a82..fffa94a8741945 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 cf5c5160241831..bbcab9e62fb5ac 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 5530a64c6c0645..4696003a4b6630 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 7c6780c4218825..f2f07b1dc64cbb 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 7f160177836677..756d84e76dc359 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 7a11a1a491bd84..6bec0d8347977e 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 1ec01821897d37..b36b15096c3045 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 950c1830c7263f..dd4b01210facff 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 fefe7c7dd13d9a..fb5bcf7b31bb90 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 7166e75f296e64..045d893ee29350 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 53bda5bdd85ab6..8afdf7780bd1c2 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 3d527618290b31..c5183bf09080f1 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 c47e79e4a2823e..8b32afa2a5af3e 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 45818a24bb51e9..e4332127af9953 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 a84232e707201f..6d2583624a05e8 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 638e026e1ddfd8..7fefc5a0d80483 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 621e6b1d5bbfac..953fd6c43b3c3c 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 c40e7e08fca662..dda708c86e4ea6 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 16b18fc29c48c7..75fcc7f0301ff3 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 0ea97a76e7587e..e33a298d98073d 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 b5d0a6a5327f8c..87c9c3a2c01092 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 34f72a4d003d31..902168c356b18d 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 b8de3bb0dc2a66..57687180bffe94 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 3f17c4b5bb9170..9afdb3ef048d25 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 8585537c6a59c7..3de039e6a987d3 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 d2af3f3b23a92f..acfb2fceae2d2b 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 75a69e60fb7a56..0625e799271cd0 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 887b31c52e2231..e16f4325523f37 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 e226fe353d2959..d88a05e4da2986 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 6a3068c75a39ff..f53121618aade4 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 773a992bb96bd3..c5488b5986d0f9 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 aaa6a9a7ba4af7..43116e01533178 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 54e0c265c223a4..9d8ec4890d6c2e 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 f4239fd51f57fa..f57a6e17c18465 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 00e6bda13b8526..b9e75e829e6744 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 9ffaece5e73a44..58cd7ba2309f3b 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 4a0ab96358cafe..67adbd20f0393d 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 c078ba30c92dc0..c381675816d7b7 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 f77bea48b565a9..b28c9308644447 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 9af9686055d7d3..9777b0499f82e1 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 19b78f940af634..5bbec2f93e4b70 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 55d3f7460c18ff..9a787564a32dff 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 b95adbe1e98c4f..41532c3f6ef2af 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 6ecaa289c0c150..e6bff3e771bcaa 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 de3561f4a2dc18..0d845425741190 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 dbeaa111ee613f..51f7e99d7e0383 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 61742c50f9b1a7..d53edc229f380f 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 ee0c7bd5108838..b8b8b667ad8e0f 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 5b32f1094d241f..43fb2cdbc55835 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 d537c6b0b035fe..8db4ddd64f4c06 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 46109674b3804c..994b9b96ad7453 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 c4f4adcd180ddc..cebb93c8f2c8d4 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 adf549880de98e..a8caa9f21bd503 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 212ca9d98a3f9c..03f3f914489301 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 2ea38ba6702842..ec5fb2866e4cad 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 f8858bc643fd76..e97b9c684fef4e 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 dab977c681456a..8c82eb436771dd 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 3ff253fe4f57f6..8ed4f7a501cdd1 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 238977cea6b38f..1b9abfada19571 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 5f3cae94da0f81..38004c5fa33de7 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 b7eb55979a8719..1167b5dbdac1f7 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 4e90233cb29795..30ef4a65d90c89 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 1fc217cc072156..6fcbc55471c06d 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 508c77123c2dbd..e21f5dd1797ea0 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 7b14de0e8646c3..20bf944d2e739f 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 252f41b458e598..3ba4616ffb1066 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 05466252791b51..9ecc729077c00f 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 d6495df6d0acf1..a0f499be4069d2 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 47af48160080c6..2c1b7ef608403b 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 bd089309afe94b..8035295e9cb61d 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 d2557535b44e4a..6858e96d1686e4 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 69373adaf8a282..1ae61bcad12d81 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 54b0d3d375e478..2eb924c8f01fe2 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 1e301e049d5072..f7d9111b1b2455 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 5c3680f2f335ec..b0943c7867ecaf 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 7c95e8e01290f1..b0b70630bb1b7a 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 e6632fd3d94c14..3c06ea984a37ea 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 26b5806dea9a01..e97a749a778a63 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 54ba94abacf99d..edebcbd2ac9701 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 5492c604356d4a..827214b01436f1 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 958f1ca2328085..4635d35a3055f3 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 9c6ecdbeba61cd..40715db849e2f6 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 b739e85cdf065e..c84260cbf1ad6c 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 9cd835dff44a90..0a107bd3ff87f6 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 56d4f5f3966c75..c76619ed3fa567 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 9bc0ab8d02ec11..292443681e9df8 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 b2e14a9619916b..1c562c175e7520 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 f2c2055831866f..bd9d3b154e36ee 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 3a219b956d5560..a00120bdb7ac85 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 4637dd0edc3491..10c7f5d341abb0 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 9cd5f93bfc9aec..53129abc438165 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 0001944d218fc3..74ba8c72814529 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 a4d3562b1605f3..5dfec947495aa1 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 0575aeaee1e920..e9a3c5cc864e99 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 de07c0cf08badc..439150ab66ddc8 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 44573820cd23c0..7a9308c95a95d5 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 6e0515147ee61e..600f07b8b5899c 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 79806a992b8a1d..2953dd1ab453bb 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 d213492b5ad0f6..16b101340c8ddc 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 b63a8c89b008b9..cd5d975c555050 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 ff8563d2bb3653..92e4aa6162e426 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 4d5dcdac21b3d1..84e9aa685d73af 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 99056df10a9831..8dc335caca5f04 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 0e55fa0bd2d146..38e3fde77a7651 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 e1932d069abeb5..ebfd6aad165365 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 7adedcf8512bc9..fd2481a63d5552 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 cb090f59a42d7e..12a43079fddc01 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 27e99d42266d87..b4d7f6ebb0cb52 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 75705c7a96ef45..51e059889721fc 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 1a6b51e5c1a89c..8e60a54671490d 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 ab32c443b2cae4..3a2373adf4c07d 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 6968c55964a24c..7654bf536831d6 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 175a945e84e170..8a069b42a27a94 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 61f49150a6a8c2..f0c941a87fec40 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 c51023a5bc8660..e0d9354564c111 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 78898487acd901..d0b9d67c15c616 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 7db6296f9e8d71..28c8d3e24228c6 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 28ce02490f4f60..cb472cba7d1907 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 2e7b6c4efae73e..86d641a0bd7c26 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 d352af8c36adc6..3c0c354c5e8fc9 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 8eb1838c0c8930..39ae6a22b1e129 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 0e6b3e541b9293..d28740c6413835 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 e99eec16ee65eb..03da966c0cfa55 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 591edac2cc36a3..92ec9164c3e9b8 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 3714df131c1f5e..163db8e48c3fb6 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 14edcd58d4f631..dcbead3d7da11f 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 23472591269852..1aef5e22638c32 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 7e02cf0a9d7f90..aa33c087a80f5f 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 1cc91fcaa9aa10..411779af44cdae 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 cdef973658952c..ee9244662246a5 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 c19f1f020bb7a1..8bec491008d872 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 c472797bd512f2..a62fe1833537fe 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 833f0744b2dd0d..ebc8bcd4901327 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 8ba7b7ac8f814e..c0de39a4906dd3 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 488795354f9672..e0d67c0674e89f 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 d343f15e353d1b..f6f1bf60e80a7d 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 81478103bc473b..54561723ce31d2 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 9cefc36bf90c3c..b3487a759cf73e 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 072bbf07cc16b4..a807b51add57aa 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 40ebc2700465c8..da753c2e161c14 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 1f0f67f9f2e27c..0530a8d1297c13 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 b648e4c286238c..2c82edb14af46f 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 f4eb6098c913a8..ca757643e80f0f 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 423e33ffaf647b..715af4d568feba 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 fc34528b1e8482..c1f0714d3a4ad8 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 #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 5090a4489f1c09..f87755485085a8 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 2a5ce42e93d38c..4d1122faa9f4ef 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 #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 5d814e146f05a6..d607afa05ba8de 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 fadf243d8f728c..bd8fd6782b6b6a 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 #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 993e1d0b8fcb2f..22bfa18db8e964 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 36ca6aba253134..519d6db87eace1 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 1969dd318b9b30..5f2efb30a5e38d 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 #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 32ab0af0c79fe9..b706f13ceda8f8 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 da69a6ee01d2c3..faf8b8212b2a10 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 #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 0e3da7b3e3787e..82bbac5e62c9c9 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 #include -#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 cf73b80a0ccb37..e59730bbe4d5d4 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 -#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 fd276db274e53e..5095de88c13fb4 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 #include -#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 f7bfd79a01d00c..3efbbf063db0c5 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 3cff8e989e65b6..ea28ab9da27d69 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 #include -#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 740016a4193167..f02b37d6ccdb2c 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 d8a25453d28cca..7614f860027f60 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 #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 3f24bfe3dd6861..aec2d7a533c645 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 50fd24dc6c54a4..681f01daa3d550 100644 --- a/chrome/common/extensions/api/omnibox/omnibox_handler.h +++ b/chrome/common/extensions/api/omnibox/omnibox_handler.h @@ -7,7 +7,7 @@ #include -#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 1f1ea6dba16610..2b0f67a6026059 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 231541232b8bfc..3f58f5ac4c78af 100644 --- a/chrome/common/extensions/api/plugins/plugins_handler.h +++ b/chrome/common/extensions/api/plugins/plugins_handler.h @@ -8,7 +8,7 @@ #include #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 b22061702847b0..d2844976f570af 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 #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 2e57ddcfcfa8b8..c1ba23f5dc1930 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 42d8fee70d424c..e9640c5f8988c5 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 #include -#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 3e37d9205f2f88..466acfbd46b159 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 99d6bbf7e50011..87c5a812330e9a 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 de62e0d7379452..10300f3d523389 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 451bd123956a48..d13b94dd51cbd4 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 65d37198611d11..050ecfed220573 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 a2eb8f9565e58b..98ffec46ce8847 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 #include -#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 a05e72751529a3..d2ece73b1043fe 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 01c90c02bdac6f..759397449aa2ff 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 19f37e94fa9341..9e79f9d92ab52e 100644 --- a/chrome/common/extensions/csp_handler.h +++ b/chrome/common/extensions/csp_handler.h @@ -7,7 +7,7 @@ #include -#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 fd882cf9d2c014..1e41ea47fa2fd1 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 143c5befc77fa2..f767f24b1911d5 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 a8acbf8811ceff..978acb23ddfae7 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 f7f6a09c666b6c..bd0453b0e9eef4 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 10087110ba5c3b..962a4f564cbb70 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 33d9abcbe400c3..483d4b1e4d1012 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 7dc3ea09c44bed..f7d7b23525ec17 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 84a9ae389b446e..2be19ca9892661 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 2af3e0a1da8efe..dd1215b8662a86 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 918f32b9438eed..f0c2c8c6d871f8 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 45cf6a239f2dd6..b434b4e32a1de9 100644 --- a/chrome/common/extensions/features/complex_feature.h +++ b/chrome/common/extensions/features/complex_feature.h @@ -8,7 +8,7 @@ #include #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 cc91c41919bf9c..c4477aa89ea9a2 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 aa6be16080b665..b3716b7968ac63 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 63bb78c75ba3de..1e66fe4bba87bc 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 7798eac37efadf..2d2d2c60d0a9d2 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 f43929ff0b41dc..c74ed9dcde0fbb 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 #include -#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 f2357bf42432df..8cb28fb70cf265 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 #include -#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 9ce42a4b851026..6e48e8203f74fa 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 389c7ee0d69549..5b48c2718b75d8 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 -#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 bb40549f796787..fd05f38a86297b 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 b17040eebfdb91..ef0cd0d3c62ff6 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 8d0624869a64b1..7be1d2391788a3 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 ede81b80e1a5cc..681da8ba67a77c 100644 --- a/chrome/common/extensions/manifest_handlers/externally_connectable.h +++ b/chrome/common/extensions/manifest_handlers/externally_connectable.h @@ -9,7 +9,7 @@ #include #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 35de4f8cba5f19..74342187df0bbf 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 147e7cf981bc92..924eb189759290 100644 --- a/chrome/common/extensions/manifest_handlers/icons_handler.h +++ b/chrome/common/extensions/manifest_handlers/icons_handler.h @@ -7,8 +7,8 @@ #include -#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 71144b7d6c91b4..07805b4bf86b6d 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 #include -#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 569568c512085f..b1277d8094f5c8 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 743eed2651c78d..123536cbcccf80 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 #include -#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 ae2199fa07de98..760624b4fec375 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 #include -#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 e9b2c9e50f5352..36d20f1005da4e 100644 --- a/chrome/common/extensions/manifest_handlers/requirements_handler.h +++ b/chrome/common/extensions/manifest_handlers/requirements_handler.h @@ -8,7 +8,7 @@ #include #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 eb3c5dc57d1c96..1af913b12ec443 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 -#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 c71a1c32c1b3ce..8eff8e449b037d 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 ace8c5895a3aa2..3ab9c7e41f8f2a 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 6b9a3320ea8f0f..c9f41624c4e97d 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 ef9d869d1326cd..ba36e3be9cfea1 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 #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 0fbdcfc3550259..d30c0b7b30cd67 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 64f650e2f73918..6e7651e435a595 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 8b5908fc8ab53c..d7169437cb4fb5 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 0d15bf213d90c0..ae819d816e4742 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 c87b3c7eb17c9d..187be015e63ef8 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 b2fe4176f984fd..aeead3f5d5642b 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 27bf3e4413250f..c2baa8d3dce2c5 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 368bb5d8395b0d..b376f4723aa41a 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 415f5c6e12ab67..e0a87e24f61e93 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 d014a851f890cf..1408494435aae4 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 8aeb13ea5f4e4d..b9737aaece1468 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 245f5af397745e..26abab569b6c70 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 fa00693e339a8d..b223e526453176 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 0b7f076a079f55..0279d369fe40d5 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 a53a5cc0c67883..e62257c2719258 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 19f46a424d70c3..b8c4e5ff6cc37c 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 52229bda14e116..1c7d3d09853d89 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 34934dd36a2dd4..181171e7f6652a 100644 --- a/chrome/common/extensions/manifest_url_handler.h +++ b/chrome/common/extensions/manifest_url_handler.h @@ -7,7 +7,7 @@ #include -#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 75acc5bcca0d54..515854c1f8f378 100644 --- a/chrome/common/extensions/mime_types_handler.h +++ b/chrome/common/extensions/mime_types_handler.h @@ -10,7 +10,7 @@ #include #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 302df86179533a..9fc6dbf4ec32dc 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 dd98321b01578f..ad1dbf001c79d4 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 e09e627388dd8f..9c4f0ac13620e8 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 d7d9c4659f5ad7..2ba640abbb33d3 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 61db433c53ea6d..95f262f3549e45 100644 --- a/chrome/common/extensions/web_accessible_resources_handler.h +++ b/chrome/common/extensions/web_accessible_resources_handler.h @@ -7,7 +7,7 @@ #include -#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 64c7db3c2bb30a..5d9b53073d2394 100644 --- a/chrome/common/extensions/webview_handler.h +++ b/chrome/common/extensions/webview_handler.h @@ -7,7 +7,7 @@ #include -#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 b34e4574424b60..0c9a10deef1d5f 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 926ccd36d6a832..ffb7765ac9cb54 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 51f1a3cff8cc47..a2fcbc19555ea6 100644 --- a/chrome/renderer/chrome_content_renderer_client_unittest.cc +++ b/chrome/renderer/chrome_content_renderer_client_unittest.cc @@ -7,9 +7,9 @@ #include #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 d180fcf70e2374..e2c7e32c3a3600 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 49c93978d666fb..40b6fe1db9c25c 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 1470158239c669..002b12920abd4c 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 475a20261a3c71..02d287fe517812 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 943e97d334d759..11f1f3b64d4861 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 341d93e896dbcc..2fe4a2406e06aa 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 3c93154e26daca..31140e4609bcd3 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 ace06c9d443b49..5638c34b5d734f 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 653a5a5778d525..18c028c7eae3a6 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 34bc7f3b21deb2..ad47414c5f1531 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 fba73555d2165b..5a0915e548690c 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 4966c44a6dc253..0b20bcf40d1274 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 526a5109ae2884..4b7b9e951a265b 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 6237a24f74dd49..659baef8ed204d 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 bab657d2854049..acc5401d82e8a0 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 4cf279ce2fe1b7..47e06f97933447 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 01b7ee8255aa7b..1f37d021d99639 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 diff --git a/chrome/test/remoting/remote_desktop_browsertest.cc b/chrome/test/remoting/remote_desktop_browsertest.cc index 7a02366ee5187f..677392506a5d0f 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 3cc0d30c792ce8..68eb979937a8fb 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 caeaf6ebadb88f..371c59ff71814e 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 eb74a172b0de90..28a2522809d7b0 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 2b0dd515d4cc23..f286a2e6096979 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 eb64dd1d0eae2c..55fbba053e3baf 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 2cc0b57452fcf0..903c4e09565d85 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 02d606dea2c9ac..f85e3ef5a66ad3 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 69effe0a70e4ef..aa0ed038b0824d 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 012f719c49c5f3..2bff206cdda2f1 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 b023eed152c183..8eaf48851e7679 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 987908b0140c9d..f53cdd3e966425 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 863a5205c47074..35c02b87abd740 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 3ae5be4094cbe0..cccb800ac21532 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 34509b4aff7ba5..6a9adcee6ae481 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 similarity index 99% rename from chrome/common/extensions/extension.cc rename to extensions/common/extension.cc index 71018ccd2b0605..f38d547a0f3223 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 similarity index 99% rename from chrome/common/extensions/extension.h rename to extensions/common/extension.h index 2bb79eb0735447..642efb2d69e394 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 #include @@ -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 a8b2fa0b529017..dd68ffd09ea34e 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 ef5a14fb153064..f993e9467ac897 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 944389d6a9fc23..4546f3283abe2d 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 620f0d672eb686..9a3a29298b2e6c 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 f32cc4b2965be2..1ec404eaea1826 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 40d492008f33f2..113c341c31324a 100644 --- a/extensions/common/manifest_handlers/background_info.h +++ b/extensions/common/manifest_handlers/background_info.h @@ -9,7 +9,7 @@ #include #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 686c84bb190c9a..b57a8a633d0f4e 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 b27576150f2fff..cd44934a93ddbc 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 similarity index 99% rename from chrome/common/extensions/permissions/permissions_data.cc rename to extensions/common/permissions/permissions_data.cc index e023712d50923d..f43d1d77433457 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 similarity index 97% rename from chrome/common/extensions/permissions/permissions_data.h rename to extensions/common/permissions/permissions_data.h index d0b6413aa4b890..72b9d247f6708a 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 #include @@ -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 similarity index 99% rename from chrome/common/extensions/permissions/permissions_data_unittest.cc rename to extensions/common/permissions/permissions_data_unittest.cc index f4e0d3ef35b931..3ea4856a5151c5 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 d673ac16673832..16d55b5a632c91 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',