diff options
43 files changed, 48 insertions, 48 deletions
diff --git a/apps/saved_files_service.cc b/apps/saved_files_service.cc index 20f81e8..b4dfab7 100644 --- a/apps/saved_files_service.cc +++ b/apps/saved_files_service.cc @@ -15,9 +15,9 @@ #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/permissions/permission_set.h" #include "content/public/browser/notification_service.h" #include "extensions/common/permissions/api_permission.h" +#include "extensions/common/permissions/permission_set.h" namespace apps { diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index bd8a606..a84f27c 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -116,7 +116,6 @@ #include "chrome/common/extensions/background_info.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest_url_handler.h" -#include "chrome/common/extensions/permissions/permission_set.h" #include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" @@ -140,6 +139,7 @@ #include "content/public/common/ssl_status.h" #include "content/public/common/webplugininfo.h" #include "extensions/browser/view_type_utils.h" +#include "extensions/common/permissions/permission_set.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 11c4406..ae34df73 100644 --- a/chrome/browser/background/background_application_list_model.cc +++ b/chrome/browser/background/background_application_list_model.cc @@ -27,10 +27,10 @@ #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/permission_set.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "extensions/common/extension_resource.h" +#include "extensions/common/permissions/permission_set.h" #include "ui/base/l10n/l10n_util_collator.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc index 62aa6c2..a2a0b6d 100644 --- a/chrome/browser/background/background_application_list_model_unittest.cc +++ b/chrome/browser/background/background_application_list_model_unittest.cc @@ -19,12 +19,12 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/permissions_updater.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/permission_set.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/manifest_constants.h" #include "extensions/common/permissions/api_permission.h" +#include "extensions/common/permissions/permission_set.h" #include "testing/gtest/include/gtest/gtest.h" // This value is used to seed the PRNG at the beginning of a sequence of diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc index 65a593b..ccff276 100644 --- a/chrome/browser/background/background_mode_manager.cc +++ b/chrome/browser/background/background_mode_manager.cc @@ -38,10 +38,10 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/permissions/permission_set.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" +#include "extensions/common/permissions/permission_set.h" #include "grit/chrome_unscaled_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/active_tab_permission_granter.cc b/chrome/browser/extensions/active_tab_permission_granter.cc index 95b2a45..d8c0ce6 100644 --- a/chrome/browser/extensions/active_tab_permission_granter.cc +++ b/chrome/browser/extensions/active_tab_permission_granter.cc @@ -11,7 +11,6 @@ #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/permission_set.h" #include "chrome/common/extensions/permissions/permissions_data.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" @@ -19,6 +18,7 @@ #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/permissions/permission_set.h" #include "extensions/common/user_script.h" using content::RenderProcessHost; diff --git a/chrome/browser/extensions/api/location/location_manager.cc b/chrome/browser/extensions/api/location/location_manager.cc index 95579a3..d07591c 100644 --- a/chrome/browser/extensions/api/location/location_manager.cc +++ b/chrome/browser/extensions/api/location/location_manager.cc @@ -15,12 +15,12 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/common/extensions/api/location.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/permission_set.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/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 21c6418..3402192 100644 --- a/chrome/browser/extensions/api/management/management_api.cc +++ b/chrome/browser/extensions/api/management/management_api.cc @@ -38,13 +38,13 @@ #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/permission_set.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/error_utils.h" +#include "extensions/common/permissions/permission_set.h" #include "extensions/common/url_pattern.h" #if !defined(OS_ANDROID) diff --git a/chrome/browser/extensions/api/permissions/permissions_api.h b/chrome/browser/extensions/api/permissions/permissions_api.h index 8834587..d0d1d39 100644 --- a/chrome/browser/extensions/api/permissions/permissions_api.h +++ b/chrome/browser/extensions/api/permissions/permissions_api.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "chrome/browser/extensions/chrome_extension_function.h" #include "chrome/browser/extensions/extension_install_prompt.h" -#include "chrome/common/extensions/permissions/permission_set.h" +#include "extensions/common/permissions/permission_set.h" class ExtensionService; diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc index 3b2e70d..620c8c5 100644 --- a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc +++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc @@ -9,9 +9,9 @@ #include "base/values.h" #include "chrome/common/extensions/api/permissions.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/permission_set.h" #include "chrome/common/extensions/permissions/usb_device_permission.h" #include "extensions/common/error_utils.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/permissions/permissions_api_helpers_unittest.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc index b327840..fe3e860 100644 --- a/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc +++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc @@ -6,7 +6,7 @@ #include "base/values.h" #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h" #include "chrome/common/extensions/api/permissions.h" -#include "chrome/common/extensions/permissions/permission_set.h" +#include "extensions/common/permissions/permission_set.h" #include "extensions/common/url_pattern_set.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/api/permissions/permissions_apitest.cc b/chrome/browser/extensions/api/permissions/permissions_apitest.cc index d2923d1..736112f 100644 --- a/chrome/browser/extensions/api/permissions/permissions_apitest.cc +++ b/chrome/browser/extensions/api/permissions/permissions_apitest.cc @@ -8,7 +8,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/common/extensions/permissions/permission_set.h" +#include "extensions/common/permissions/permission_set.h" #include "extensions/common/switches.h" #include "net/dns/mock_host_resolver.h" diff --git a/chrome/browser/extensions/api/preference/preference_helpers.h b/chrome/browser/extensions/api/preference/preference_helpers.h index f12d8e8..ba227af 100644 --- a/chrome/browser/extensions/api/preference/preference_helpers.h +++ b/chrome/browser/extensions/api/preference/preference_helpers.h @@ -7,8 +7,8 @@ #include <string> -#include "chrome/common/extensions/permissions/permission_set.h" #include "extensions/browser/extension_prefs_scope.h" +#include "extensions/common/permissions/permission_set.h" class Profile; 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 b10826f..135fd10 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 @@ -14,12 +14,12 @@ #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/permissions/permission_set.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 "extensions/common/permissions/permission_set.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/bundle_installer.cc b/chrome/browser/extensions/bundle_installer.cc index ec8b8e5..3bd45c0 100644 --- a/chrome/browser/extensions/bundle_installer.cc +++ b/chrome/browser/extensions/bundle_installer.cc @@ -20,10 +20,10 @@ #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/permission_set.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/permissions/permission_set.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/convert_web_app_browsertest.cc b/chrome/browser/extensions/convert_web_app_browsertest.cc index 4294e3e..ec7d423 100644 --- a/chrome/browser/extensions/convert_web_app_browsertest.cc +++ b/chrome/browser/extensions/convert_web_app_browsertest.cc @@ -15,7 +15,6 @@ #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/permissions/permission_set.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/test_switches.h" #include "chrome/test/base/ui_test_utils.h" @@ -25,6 +24,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/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 fcf5948..936ed45 100644 --- a/chrome/browser/extensions/convert_web_app_unittest.cc +++ b/chrome/browser/extensions/convert_web_app_unittest.cc @@ -20,9 +20,9 @@ #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/permissions/permission_set.h" #include "chrome/common/web_application_info.h" #include "extensions/common/extension_resource.h" +#include "extensions/common/permissions/permission_set.h" #include "extensions/common/url_pattern.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/codec/png_codec.h" diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index 5b45c47..b40c1c6 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -41,7 +41,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/permission_set.h" #include "chrome/common/extensions/permissions/permissions_data.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" @@ -49,6 +48,7 @@ #include "content/public/browser/user_metrics.h" #include "extensions/common/manifest.h" #include "extensions/common/permissions/permission_message_provider.h" +#include "extensions/common/permissions/permission_set.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_browsertest.cc b/chrome/browser/extensions/crx_installer_browsertest.cc index d9c7114..a37be36 100644 --- a/chrome/browser/extensions/crx_installer_browsertest.cc +++ b/chrome/browser/extensions/crx_installer_browsertest.cc @@ -17,10 +17,10 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/feature_switch.h" -#include "chrome/common/extensions/permissions/permission_set.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/download_manager.h" #include "content/public/test/download_test_observer.h" +#include "extensions/common/permissions/permission_set.h" #include "extensions/common/switches.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/extension_disabled_ui.cc b/chrome/browser/extensions/extension_disabled_ui.cc index 0192142..738daf2 100644 --- a/chrome/browser/extensions/extension_disabled_ui.cc +++ b/chrome/browser/extensions/extension_disabled_ui.cc @@ -29,12 +29,12 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" -#include "chrome/common/extensions/permissions/permission_set.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/permissions/permission_message_provider.h" +#include "extensions/common/permissions/permission_set.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc index b786a55..556e0b7 100644 --- a/chrome/browser/extensions/extension_install_prompt.cc +++ b/chrome/browser/extensions/extension_install_prompt.cc @@ -28,7 +28,6 @@ #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/feature_switch.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" -#include "chrome/common/extensions/permissions/permission_set.h" #include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/pref_names.h" #include "content/public/browser/web_contents.h" @@ -37,6 +36,7 @@ #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/url_pattern.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc index cc04550..d016563 100644 --- a/chrome/browser/extensions/extension_prefs.cc +++ b/chrome/browser/extensions/extension_prefs.cc @@ -24,13 +24,13 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/feature_switch.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" -#include "chrome/common/extensions/permissions/permission_set.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/notification_service.h" #include "extensions/browser/pref_names.h" #include "extensions/common/manifest.h" +#include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_info.h" #include "extensions/common/url_pattern.h" #include "extensions/common/user_script.h" diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc index 4d7cc5e..289477c 100644 --- a/chrome/browser/extensions/extension_prefs_unittest.cc +++ b/chrome/browser/extensions/extension_prefs_unittest.cc @@ -18,12 +18,12 @@ #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/permissions/permission_set.h" #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/test/mock_notification_observer.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_info.h" #include "sync/api/string_ordinal.h" diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 8317fdd..3f77e82 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -80,7 +80,6 @@ #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h" #include "chrome/common/extensions/manifest_url_handler.h" -#include "chrome/common/extensions/permissions/permission_set.h" #include "chrome/common/extensions/value_builder.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" @@ -100,6 +99,7 @@ #include "extensions/common/constants.h" #include "extensions/common/extension_resource.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/permissions/permission_set.h" #include "extensions/common/url_pattern.h" #include "gpu/config/gpu_info.h" #include "grit/browser_resources.h" diff --git a/chrome/browser/extensions/permissions_updater_unittest.cc b/chrome/browser/extensions/permissions_updater_unittest.cc index 315f46b..30d71dc 100644 --- a/chrome/browser/extensions/permissions_updater_unittest.cc +++ b/chrome/browser/extensions/permissions_updater_unittest.cc @@ -15,11 +15,11 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_test_util.h" -#include "chrome/common/extensions/permissions/permission_set.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/permissions/permission_set.h" #include "testing/gtest/include/gtest/gtest.h" using extension_test_util::LoadManifest; diff --git a/chrome/browser/themes/theme_syncable_service_unittest.cc b/chrome/browser/themes/theme_syncable_service_unittest.cc index 42ae85f..82e721b 100644 --- a/chrome/browser/themes/theme_syncable_service_unittest.cc +++ b/chrome/browser/themes/theme_syncable_service_unittest.cc @@ -17,11 +17,11 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" #include "chrome/common/extensions/manifest_url_handler.h" -#include "chrome/common/extensions/permissions/permission_set.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/api_permission_set.h" +#include "extensions/common/permissions/permission_set.h" #include "sync/api/sync_error.h" #include "sync/api/sync_error_factory_mock.h" #include "sync/protocol/sync.pb.h" diff --git a/chrome/browser/ui/extensions/extension_enable_flow.cc b/chrome/browser/ui/extensions/extension_enable_flow.cc index 3e27e0c..3c49704 100644 --- a/chrome/browser/ui/extensions/extension_enable_flow.cc +++ b/chrome/browser/ui/extensions/extension_enable_flow.cc @@ -9,9 +9,9 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h" -#include "chrome/common/extensions/permissions/permission_set.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/common/permissions/permission_set.h" using extensions::Extension; 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 f6bfb0c..99056df 100644 --- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc +++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc @@ -29,13 +29,13 @@ #include "chrome/browser/prefs/browser_prefs.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/permissions/permission_set.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/manifest_constants.h" +#include "extensions/common/permissions/permission_set.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 0bc39ce..4775068 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -262,8 +262,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/permission_set.cc', - 'common/extensions/permissions/permission_set.h', 'common/extensions/permissions/permissions_data.cc', 'common/extensions/permissions/permissions_data.h', 'common/extensions/permissions/set_disjunction_permission.h', diff --git a/chrome/common/extensions/api/extension_api.cc b/chrome/common/extensions/api/extension_api.cc index f28ab3c..2490d5d 100644 --- a/chrome/common/extensions/api/extension_api.cc +++ b/chrome/common/extensions/api/extension_api.cc @@ -18,10 +18,10 @@ #include "base/values.h" #include "chrome/common/extensions/api/generated_schemas.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/permission_set.h" #include "chrome/common/extensions/permissions/permissions_data.h" #include "extensions/common/features/feature.h" #include "extensions/common/features/feature_provider.h" +#include "extensions/common/permissions/permission_set.h" #include "grit/common_resources.h" #include "grit/extensions_api_resources.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index 44e7215..86f20ff 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -22,7 +22,6 @@ #include "base/version.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_handler.h" -#include "chrome/common/extensions/permissions/permission_set.h" #include "chrome/common/extensions/permissions/permissions_data.h" #include "content/public/common/url_constants.h" #include "extensions/common/constants.h" @@ -31,6 +30,7 @@ #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/api_permission_set.h" +#include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_info.h" #include "extensions/common/switches.h" #include "extensions/common/url_pattern_set.h" diff --git a/chrome/common/extensions/extension_messages.h b/chrome/common/extensions/extension_messages.h index 381a9d7..8e0d843 100644 --- a/chrome/common/extensions/extension_messages.h +++ b/chrome/common/extensions/extension_messages.h @@ -10,11 +10,10 @@ #include "base/memory/shared_memory.h" #include "base/values.h" -#include "chrome/common/extensions/extension.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/permission_set.h" #include "chrome/common/extensions/permissions/socket_permission_data.h" #include "chrome/common/extensions/permissions/usb_device_permission_data.h" #include "chrome/common/web_application_info.h" @@ -22,6 +21,7 @@ #include "content/public/common/socket_permission_request.h" #include "extensions/common/draggable_region.h" #include "extensions/common/extensions_client.h" +#include "extensions/common/permissions/permission_set.h" #include "extensions/common/url_pattern.h" #include "extensions/common/url_pattern_set.h" #include "extensions/common/view_type.h" diff --git a/chrome/common/extensions/features/permission_feature.cc b/chrome/common/extensions/features/permission_feature.cc index 5beb26f..cc91c41 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/permission_set.h" #include "chrome/common/extensions/permissions/permissions_data.h" +#include "extensions/common/permissions/permission_set.h" namespace extensions { diff --git a/chrome/common/extensions/manifest_handlers/shared_module_info.cc b/chrome/common/extensions/manifest_handlers/shared_module_info.cc index 1bf8839..a7c8164 100644 --- a/chrome/common/extensions/manifest_handlers/shared_module_info.cc +++ b/chrome/common/extensions/manifest_handlers/shared_module_info.cc @@ -10,10 +10,10 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/version.h" -#include "chrome/common/extensions/permissions/permission_set.h" #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/permissions/permission_set.h" namespace extensions { diff --git a/chrome/common/extensions/permissions/chrome_permission_message_provider.cc b/chrome/common/extensions/permissions/chrome_permission_message_provider.cc index 1bea93b..433c18d 100644 --- a/chrome/common/extensions/permissions/chrome_permission_message_provider.cc +++ b/chrome/common/extensions/permissions/chrome_permission_message_provider.cc @@ -6,9 +6,9 @@ #include "base/stl_util.h" #include "chrome/common/extensions/permissions/permission_message_util.h" -#include "chrome/common/extensions/permissions/permission_set.h" #include "extensions/common/extensions_client.h" #include "extensions/common/permissions/permission_message.h" +#include "extensions/common/permissions/permission_set.h" #include "extensions/common/url_pattern_set.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/permissions/permission_message_util.cc b/chrome/common/extensions/permissions/permission_message_util.cc index bb43236..1a99542 100644 --- a/chrome/common/extensions/permissions/permission_message_util.cc +++ b/chrome/common/extensions/permissions/permission_message_util.cc @@ -6,9 +6,9 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/common/extensions/permissions/permission_set.h" #include "content/public/common/url_constants.h" #include "extensions/common/permissions/permission_message.h" +#include "extensions/common/permissions/permission_set.h" #include "extensions/common/url_pattern_set.h" #include "grit/generated_resources.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/chrome/common/extensions/permissions/permission_set_unittest.cc index 39fe8e4..ca335105a 100644 --- a/chrome/common/extensions/permissions/permission_set_unittest.cc +++ b/chrome/common/extensions/permissions/permission_set_unittest.cc @@ -14,11 +14,11 @@ #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/permission_set.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/permissions/permission_message_provider.h" +#include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_info.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/permissions/permissions_data.cc b/chrome/common/extensions/permissions/permissions_data.cc index d6fb529..4c31fcc 100644 --- a/chrome/common/extensions/permissions/permissions_data.cc +++ b/chrome/common/extensions/permissions/permissions_data.cc @@ -14,7 +14,6 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/permissions/chrome_scheme_hosts.h" -#include "chrome/common/extensions/permissions/permission_set.h" #include "content/public/common/url_constants.h" #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" @@ -26,6 +25,7 @@ #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/api_permission_set.h" #include "extensions/common/permissions/permission_message_provider.h" +#include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_info.h" #include "extensions/common/switches.h" #include "extensions/common/url_pattern_set.h" diff --git a/chrome/common/extensions/permissions/permissions_data_unittest.cc b/chrome/common/extensions/permissions/permissions_data_unittest.cc index 92ec84c..c2bdb07 100644 --- a/chrome/common/extensions/permissions/permissions_data_unittest.cc +++ b/chrome/common/extensions/permissions/permissions_data_unittest.cc @@ -12,7 +12,6 @@ #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/permission_set.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" @@ -20,6 +19,7 @@ #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/switches.h" #include "extensions/common/url_pattern_set.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc index b2224f2..21e55cd 100644 --- a/chrome/renderer/extensions/dispatcher.cc +++ b/chrome/renderer/extensions/dispatcher.cc @@ -26,7 +26,6 @@ #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/permission_set.h" #include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/url_constants.h" #include "chrome/renderer/chrome_render_process_observer.h" @@ -82,6 +81,7 @@ #include "extensions/common/features/feature_provider.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/permissions/permission_set.h" #include "extensions/common/view_type.h" #include "grit/common_resources.h" #include "grit/renderer_resources.h" diff --git a/chrome/common/extensions/permissions/permission_set.cc b/extensions/common/permissions/permission_set.cc index 9c97014..d3f46fc 100644 --- a/chrome/common/extensions/permissions/permission_set.cc +++ b/extensions/common/permissions/permission_set.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/extensions/permissions/permission_set.h" +#include "extensions/common/permissions/permission_set.h" #include <algorithm> #include <iterator> diff --git a/chrome/common/extensions/permissions/permission_set.h b/extensions/common/permissions/permission_set.h index e4cbd43..14ffe12 100644 --- a/chrome/common/extensions/permissions/permission_set.h +++ b/extensions/common/permissions/permission_set.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_EXTENSIONS_PERMISSIONS_PERMISSION_SET_H_ -#define CHROME_COMMON_EXTENSIONS_PERMISSIONS_PERMISSION_SET_H_ +#ifndef EXTENSIONS_COMMON_PERMISSIONS_PERMISSION_SET_H_ +#define EXTENSIONS_COMMON_PERMISSIONS_PERMISSION_SET_H_ #include <map> #include <set> @@ -140,4 +140,4 @@ class PermissionSet } // namespace extensions -#endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_PERMISSION_SET_H_ +#endif // EXTENSIONS_COMMON_PERMISSIONS_PERMISSION_SET_H_ diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index fe36c70..335eff9 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -75,6 +75,8 @@ 'common/permissions/permission_message.h', 'common/permissions/permission_message_provider.cc', 'common/permissions/permission_message_provider.h', + 'common/permissions/permission_set.cc', + 'common/permissions/permission_set.h', 'common/permissions/permissions_info.cc', 'common/permissions/permissions_info.h', 'common/permissions/permissions_provider.h', |