diff options
70 files changed, 105 insertions, 102 deletions
@@ -48,7 +48,6 @@ include_rules = [ "+chrome/common/extensions/extension_set.h", "+chrome/common/extensions/manifest_handlers/icons_handler.h", "+chrome/common/extensions/manifest_handlers/kiosk_mode_info.h", - "+chrome/common/extensions/permissions/api_permission.h", "+chrome/common/extensions/permissions/permission_set.h", ] diff --git a/apps/saved_files_service.cc b/apps/saved_files_service.cc index f832ffe..20f81e8 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/api_permission.h" #include "chrome/common/extensions/permissions/permission_set.h" #include "content/public/browser/notification_service.h" +#include "extensions/common/permissions/api_permission.h" namespace apps { diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc index 2e410c0..0c35c59 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/api_permission.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 "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/extensions/api/file_system/file_system_api.cc b/chrome/browser/extensions/api/file_system/file_system_api.cc index ea2a23f..93a2a2f 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api.cc +++ b/chrome/browser/extensions/api/file_system/file_system_api.cc @@ -27,13 +27,13 @@ #include "chrome/browser/ui/chrome_select_file_policy.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/api/file_system.h" -#include "chrome/common/extensions/permissions/api_permission.h" #include "content/public/browser/browser_thread.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 "content/public/browser/web_contents_view.h" +#include "extensions/common/permissions/api_permission.h" #include "grit/generated_resources.h" #include "net/base/mime_util.h" #include "ui/base/l10n/l10n_util.h" 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 1167e22..c07e229 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc @@ -26,7 +26,6 @@ #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/api_permission.h" #include "chrome/common/extensions/permissions/media_galleries_permission.h" #include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/pref_names.h" @@ -35,6 +34,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/permissions/api_permission.h" #if defined(OS_WIN) #include "base/strings/sys_string_conversions.h" diff --git a/chrome/browser/extensions/api/permissions/permissions_api.cc b/chrome/browser/extensions/api/permissions/permissions_api.cc index cf40ae1..9fc6536 100644 --- a/chrome/browser/extensions/api/permissions/permissions_api.cc +++ b/chrome/browser/extensions/api/permissions/permissions_api.cc @@ -13,8 +13,8 @@ #include "chrome/common/extensions/api/permissions.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/permissions/permissions_data.h" -#include "chrome/common/extensions/permissions/permissions_info.h" #include "extensions/common/error_utils.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 9a610c0..3b2e70d 100644 --- a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc +++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc @@ -10,9 +10,9 @@ #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/permissions_info.h" #include "chrome/common/extensions/permissions/usb_device_permission.h" #include "extensions/common/error_utils.h" +#include "extensions/common/permissions/permissions_info.h" #include "extensions/common/url_pattern_set.h" using extensions::APIPermission; @@ -145,5 +145,5 @@ scoped_refptr<PermissionSet> UnpackPermissionSet( new PermissionSet(apis, origins, URLPatternSet())); } -} // namespace permissions_api +} // namespace permissions_api_helpers } // namespace extensions diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc index ca6f938..87f9e1c 100644 --- a/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chrome/browser/extensions/api/preference/preference_api.cc @@ -23,12 +23,12 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/permissions/api_permission.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "extensions/browser/pref_names.h" #include "extensions/common/error_utils.h" +#include "extensions/common/permissions/api_permission.h" namespace keys = extensions::preference_api_constants; namespace helpers = extensions::preference_helpers; 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 cae3129..0d5d6bf 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc @@ -28,10 +28,10 @@ #include "chrome/common/extensions/api/push_messaging.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" -#include "chrome/common/extensions/permissions/api_permission.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/permissions/api_permission.h" #include "google_apis/gaia/gaia_constants.h" #include "url/gurl.h" 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 05e6ebb..b60b773 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/common/extensions/api/storage/storage_schema_manifest_handler.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_set.h" -#include "chrome/common/extensions/permissions/api_permission.h" #include "components/policy/core/common/schema.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" @@ -35,6 +34,7 @@ #include "extensions/common/constants.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/permissions/api_permission.h" using content::BrowserThread; 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 da38155..dd34537 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 @@ -14,9 +14,9 @@ #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 "chrome/common/extensions/permissions/api_permission.h" #include "content/public/browser/browser_thread.h" #include "extensions/common/constants.h" +#include "extensions/common/permissions/api_permission.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc index a9d5d0e..bee5000 100644 --- a/chrome/browser/extensions/extension_prefs.cc +++ b/chrome/browser/extensions/extension_prefs.cc @@ -23,13 +23,13 @@ #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/extensions/permissions/permissions_info.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/permissions_info.h" #include "extensions/common/url_pattern.h" #include "extensions/common/user_script.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc index 5d5f9c7..aa21caa 100644 --- a/chrome/browser/extensions/extension_prefs_unittest.cc +++ b/chrome/browser/extensions/extension_prefs_unittest.cc @@ -19,12 +19,12 @@ #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/permissions/permission_set.h" -#include "chrome/common/extensions/permissions/permissions_info.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/permissions_info.h" #include "sync/api/string_ordinal.h" using base::Time; diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc index c9e4260..004fca0 100644 --- a/chrome/browser/extensions/extension_tab_util.cc +++ b/chrome/browser/extensions/extension_tab_util.cc @@ -20,7 +20,6 @@ #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/api_permission.h" #include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/net/url_fixer_upper.h" #include "chrome/common/url_constants.h" @@ -29,6 +28,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/permissions/api_permission.h" #include "url/gurl.h" namespace keys = extensions::tabs_constants; diff --git a/chrome/browser/extensions/script_bubble_controller.cc b/chrome/browser/extensions/script_bubble_controller.cc index 08828a3..a47d24a 100644 --- a/chrome/browser/extensions/script_bubble_controller.cc +++ b/chrome/browser/extensions/script_bubble_controller.cc @@ -13,8 +13,8 @@ #include "chrome/browser/extensions/location_bar_controller.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/api_permission.h" #include "content/public/browser/navigation_details.h" +#include "extensions/common/permissions/api_permission.h" using extensions::APIPermission; diff --git a/chrome/browser/extensions/suggest_permission_util.cc b/chrome/browser/extensions/suggest_permission_util.cc index 6a61fa0..cd9e1db 100644 --- a/chrome/browser/extensions/suggest_permission_util.cc +++ b/chrome/browser/extensions/suggest_permission_util.cc @@ -8,9 +8,9 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/extensions/permissions/permissions_info.h" #include "content/public/browser/render_view_host.h" #include "content/public/common/console_message_level.h" +#include "extensions/common/permissions/permissions_info.h" using content::CONSOLE_MESSAGE_LEVEL_WARNING; using content::RenderViewHost; diff --git a/chrome/browser/extensions/suggest_permission_util.h b/chrome/browser/extensions/suggest_permission_util.h index b71d3d4..ba55aec 100644 --- a/chrome/browser/extensions/suggest_permission_util.h +++ b/chrome/browser/extensions/suggest_permission_util.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_SUGGEST_PERMISSION_UTIL_H_ #define CHROME_BROWSER_EXTENSIONS_SUGGEST_PERMISSION_UTIL_H_ -#include "chrome/common/extensions/permissions/api_permission.h" +#include "extensions/common/permissions/api_permission.h" class Profile; diff --git a/chrome/browser/media_galleries/media_galleries_preferences.cc b/chrome/browser/media_galleries/media_galleries_preferences.cc index 09744b3..df5bbec 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences.cc @@ -27,12 +27,12 @@ #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/api_permission.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/permissions/api_permission.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/themes/theme_syncable_service_unittest.cc b/chrome/browser/themes/theme_syncable_service_unittest.cc index 0d53ee3..42ae85f 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/api_permission_set.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 "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/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index 3cfb99d..d514c51 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc @@ -32,7 +32,6 @@ #include "chrome/common/content_settings_pattern.h" #include "chrome/common/extensions/extension_set.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" -#include "chrome/common/extensions/permissions/api_permission.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/notification_service.h" @@ -41,6 +40,7 @@ #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_ui.h" #include "content/public/common/content_switches.h" +#include "extensions/common/permissions/api_permission.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 4c58171..dc50d33 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -243,10 +243,6 @@ 'common/extensions/message_bundle.h', 'common/extensions/mime_types_handler.cc', 'common/extensions/mime_types_handler.h', - 'common/extensions/permissions/api_permission.cc', - 'common/extensions/permissions/api_permission.h', - 'common/extensions/permissions/api_permission_set.cc', - 'common/extensions/permissions/api_permission_set.h', 'common/extensions/permissions/bluetooth_permission.cc', 'common/extensions/permissions/bluetooth_permission.h', 'common/extensions/permissions/bluetooth_permission_data.cc', @@ -265,8 +261,6 @@ 'common/extensions/permissions/permission_set.h', 'common/extensions/permissions/permissions_data.cc', 'common/extensions/permissions/permissions_data.h', - 'common/extensions/permissions/permissions_info.cc', - 'common/extensions/permissions/permissions_info.h', 'common/extensions/permissions/set_disjunction_permission.h', 'common/extensions/permissions/socket_permission.cc', 'common/extensions/permissions/socket_permission.h', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index d114598..46d1362 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -520,6 +520,7 @@ '../extensions/common/matcher/url_matcher_factory_unittest.cc', '../extensions/common/matcher/url_matcher_unittest.cc', '../extensions/common/one_shot_event_unittest.cc', + '../extensions/common/permissions/api_permission_set_unittest.cc', '../extensions/common/url_pattern_set_unittest.cc', '../extensions/common/url_pattern_unittest.cc', '../extensions/common/user_script_unittest.cc', @@ -1786,7 +1787,6 @@ 'common/extensions/manifest_unittest.cc', 'common/extensions/manifest_handler_unittest.cc', 'common/extensions/message_bundle_unittest.cc', - 'common/extensions/permissions/api_permission_set_unittest.cc', 'common/extensions/permissions/media_galleries_permission_unittest.cc', 'common/extensions/permissions/permission_set_unittest.cc', 'common/extensions/permissions/permissions_data_unittest.cc', diff --git a/chrome/common/extensions/api/plugins/plugins_handler.cc b/chrome/common/extensions/api/plugins/plugins_handler.cc index 03357a0..1f1ea6d 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/api_permission.h" -#include "chrome/common/extensions/permissions/api_permission_set.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 "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/api/sockets/sockets_handler.cc b/chrome/common/extensions/api/sockets/sockets_handler.cc index a367239..fdc6984 100644 --- a/chrome/common/extensions/api/sockets/sockets_handler.cc +++ b/chrome/common/extensions/api/sockets/sockets_handler.cc @@ -9,11 +9,11 @@ #include "base/values.h" #include "chrome/common/extensions/api/manifest_types.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/api_permission_set.h" #include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/extensions/permissions/socket_permission_data.h" #include "extensions/common/error_utils.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/permissions/api_permission_set.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 d95a967..a9bef0ce 100644 --- a/chrome/common/extensions/api/storage/storage_schema_manifest_handler.cc +++ b/chrome/common/extensions/api/storage/storage_schema_manifest_handler.cc @@ -14,11 +14,11 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/api_permission.h" #include "components/policy/core/common/schema.h" #include "extensions/common/install_warning.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/permissions/api_permission.h" using extensions::manifest_keys::kStorageManagedSchema; 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 d57747a..451bd12 100644 --- a/chrome/common/extensions/api/system_indicator/system_indicator_handler.cc +++ b/chrome/common/extensions/api/system_indicator/system_indicator_handler.cc @@ -9,9 +9,9 @@ #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/api_permission_set.h" #include "chrome/common/extensions/permissions/permissions_data.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/permissions/api_permission_set.h" namespace extensions { diff --git a/chrome/common/extensions/background_info.cc b/chrome/common/extensions/background_info.cc index 4862aa4..54be0b8 100644 --- a/chrome/common/extensions/background_info.cc +++ b/chrome/common/extensions/background_info.cc @@ -12,11 +12,11 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_file_util.h" -#include "chrome/common/extensions/permissions/api_permission_set.h" #include "chrome/common/extensions/permissions/permissions_data.h" #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/permissions/api_permission_set.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index 29a9e44..1855691 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -21,16 +21,16 @@ #include "base/values.h" #include "base/version.h" #include "chrome/common/extensions/manifest_handler.h" -#include "chrome/common/extensions/permissions/api_permission_set.h" #include "chrome/common/extensions/permissions/permission_set.h" #include "chrome/common/extensions/permissions/permissions_data.h" -#include "chrome/common/extensions/permissions/permissions_info.h" #include "content/public/common/url_constants.h" #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" #include "extensions/common/id_util.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/permissions/api_permission_set.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" diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h index 3c1067d..c84f7f3 100644 --- a/chrome/common/extensions/extension.h +++ b/chrome/common/extensions/extension.h @@ -21,10 +21,10 @@ #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/permissions/api_permission.h" #include "extensions/common/extension_resource.h" #include "extensions/common/install_warning.h" #include "extensions/common/manifest.h" +#include "extensions/common/permissions/api_permission.h" #include "extensions/common/url_pattern.h" #include "extensions/common/url_pattern_set.h" #include "ui/base/accelerators/accelerator.h" diff --git a/chrome/common/extensions/extension_messages.cc b/chrome/common/extensions/extension_messages.cc index 1530222..0e3c5e4 100644 --- a/chrome/common/extensions/extension_messages.cc +++ b/chrome/common/extensions/extension_messages.cc @@ -7,9 +7,9 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/permissions/permissions_data.h" -#include "chrome/common/extensions/permissions/permissions_info.h" #include "content/public/common/common_param_traits.h" #include "extensions/common/manifest.h" +#include "extensions/common/permissions/permissions_info.h" using extensions::APIPermission; using extensions::APIPermissionInfo; diff --git a/chrome/common/extensions/manifest_handlers/app_isolation_info.cc b/chrome/common/extensions/manifest_handlers/app_isolation_info.cc index 98989b9..7798eac 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/api_permission_set.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" namespace extensions { diff --git a/chrome/common/extensions/manifest_handlers/externally_connectable.cc b/chrome/common/extensions/manifest_handlers/externally_connectable.cc index 0b55d74..8104a45 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/api_permission_set.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/url_pattern.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "url/gurl.h" diff --git a/chrome/common/extensions/manifest_url_handler.cc b/chrome/common/extensions/manifest_url_handler.cc index 14e0189..1e3e349 100644 --- a/chrome/common/extensions/manifest_url_handler.cc +++ b/chrome/common/extensions/manifest_url_handler.cc @@ -13,13 +13,13 @@ #include "base/values.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/extensions/extension_file_util.h" -#include "chrome/common/extensions/permissions/api_permission.h" -#include "chrome/common/extensions/permissions/api_permission_set.h" #include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/url_constants.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 "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/permissions/bluetooth_permission.cc b/chrome/common/extensions/permissions/bluetooth_permission.cc index 984c4a0..4d82868 100644 --- a/chrome/common/extensions/permissions/bluetooth_permission.cc +++ b/chrome/common/extensions/permissions/bluetooth_permission.cc @@ -11,7 +11,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/extensions/permissions/bluetooth_permission_data.h" -#include "chrome/common/extensions/permissions/permissions_info.h" +#include "extensions/common/permissions/permissions_info.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/permissions/bluetooth_permission.h b/chrome/common/extensions/permissions/bluetooth_permission.h index 7ca8445..5eea337 100644 --- a/chrome/common/extensions/permissions/bluetooth_permission.h +++ b/chrome/common/extensions/permissions/bluetooth_permission.h @@ -7,9 +7,9 @@ #include <string> -#include "chrome/common/extensions/permissions/api_permission.h" #include "chrome/common/extensions/permissions/bluetooth_permission_data.h" #include "chrome/common/extensions/permissions/set_disjunction_permission.h" +#include "extensions/common/permissions/api_permission.h" namespace extensions { diff --git a/chrome/common/extensions/permissions/bluetooth_permission_data.h b/chrome/common/extensions/permissions/bluetooth_permission_data.h index 9ae5dd4..25413d4 100644 --- a/chrome/common/extensions/permissions/bluetooth_permission_data.h +++ b/chrome/common/extensions/permissions/bluetooth_permission_data.h @@ -8,7 +8,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "chrome/common/extensions/permissions/api_permission.h" +#include "extensions/common/permissions/api_permission.h" namespace base { diff --git a/chrome/common/extensions/permissions/chrome_api_permissions.cc b/chrome/common/extensions/permissions/chrome_api_permissions.cc index 55b10a9..3eed610 100644 --- a/chrome/common/extensions/permissions/chrome_api_permissions.cc +++ b/chrome/common/extensions/permissions/chrome_api_permissions.cc @@ -4,14 +4,14 @@ #include "chrome/common/extensions/permissions/chrome_api_permissions.h" -#include "chrome/common/extensions/permissions/api_permission.h" -#include "chrome/common/extensions/permissions/api_permission_set.h" #include "chrome/common/extensions/permissions/bluetooth_permission.h" #include "chrome/common/extensions/permissions/media_galleries_permission.h" -#include "chrome/common/extensions/permissions/permissions_info.h" #include "chrome/common/extensions/permissions/socket_permission.h" #include "chrome/common/extensions/permissions/usb_device_permission.h" +#include "extensions/common/permissions/api_permission.h" +#include "extensions/common/permissions/api_permission_set.h" #include "extensions/common/permissions/permission_message.h" +#include "extensions/common/permissions/permissions_info.h" #include "grit/generated_resources.h" namespace extensions { diff --git a/chrome/common/extensions/permissions/chrome_scheme_hosts.cc b/chrome/common/extensions/permissions/chrome_scheme_hosts.cc index 6833597..722d20c 100644 --- a/chrome/common/extensions/permissions/chrome_scheme_hosts.cc +++ b/chrome/common/extensions/permissions/chrome_scheme_hosts.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/api_permission_set.h" #include "chrome/common/extensions/permissions/chrome_scheme_hosts.h" #include "chrome/common/url_constants.h" +#include "extensions/common/permissions/api_permission_set.h" #include "extensions/common/url_pattern.h" #include "extensions/common/url_pattern_set.h" diff --git a/chrome/common/extensions/permissions/media_galleries_permission.cc b/chrome/common/extensions/permissions/media_galleries_permission.cc index f3cd7af..807e600 100644 --- a/chrome/common/extensions/permissions/media_galleries_permission.cc +++ b/chrome/common/extensions/permissions/media_galleries_permission.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/common/extensions/permissions/permissions_info.h" +#include "extensions/common/permissions/permissions_info.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/permissions/media_galleries_permission.h b/chrome/common/extensions/permissions/media_galleries_permission.h index c94bd1c..831a4f6 100644 --- a/chrome/common/extensions/permissions/media_galleries_permission.h +++ b/chrome/common/extensions/permissions/media_galleries_permission.h @@ -6,9 +6,9 @@ #define CHROME_COMMON_EXTENSIONS_PERMISSIONS_MEDIA_GALLERIES_PERMISSION_H_ #include "base/basictypes.h" -#include "chrome/common/extensions/permissions/api_permission.h" #include "chrome/common/extensions/permissions/media_galleries_permission_data.h" #include "chrome/common/extensions/permissions/set_disjunction_permission.h" +#include "extensions/common/permissions/api_permission.h" namespace extensions { diff --git a/chrome/common/extensions/permissions/media_galleries_permission_data.h b/chrome/common/extensions/permissions/media_galleries_permission_data.h index 896242d..9d13eae 100644 --- a/chrome/common/extensions/permissions/media_galleries_permission_data.h +++ b/chrome/common/extensions/permissions/media_galleries_permission_data.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "chrome/common/extensions/permissions/api_permission.h" +#include "extensions/common/permissions/api_permission.h" namespace base { class Value; diff --git a/chrome/common/extensions/permissions/media_galleries_permission_unittest.cc b/chrome/common/extensions/permissions/media_galleries_permission_unittest.cc index f3cb3a8..b6dbf70 100644 --- a/chrome/common/extensions/permissions/media_galleries_permission_unittest.cc +++ b/chrome/common/extensions/permissions/media_galleries_permission_unittest.cc @@ -5,10 +5,10 @@ // These tests make sure MediaGalleriesPermission values are parsed correctly. #include "base/values.h" -#include "chrome/common/extensions/permissions/api_permission.h" #include "chrome/common/extensions/permissions/media_galleries_permission.h" #include "chrome/common/extensions/permissions/media_galleries_permission_data.h" -#include "chrome/common/extensions/permissions/permissions_info.h" +#include "extensions/common/permissions/api_permission.h" +#include "extensions/common/permissions/permissions_info.h" #include "testing/gtest/include/gtest/gtest.h" using content::SocketPermissionRequest; diff --git a/chrome/common/extensions/permissions/permission_set.cc b/chrome/common/extensions/permissions/permission_set.cc index 7406bb5..d027605 100644 --- a/chrome/common/extensions/permissions/permission_set.cc +++ b/chrome/common/extensions/permissions/permission_set.cc @@ -10,9 +10,9 @@ #include "base/stl_util.h" #include "chrome/common/extensions/permissions/permission_message_util.h" -#include "chrome/common/extensions/permissions/permissions_info.h" #include "content/public/common/url_constants.h" #include "extensions/common/extensions_client.h" +#include "extensions/common/permissions/permissions_info.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/permissions/permission_set.h b/chrome/common/extensions/permissions/permission_set.h index 0083a08..0f78bda 100644 --- a/chrome/common/extensions/permissions/permission_set.h +++ b/chrome/common/extensions/permissions/permission_set.h @@ -14,9 +14,9 @@ #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" #include "base/strings/string16.h" -#include "chrome/common/extensions/permissions/api_permission.h" -#include "chrome/common/extensions/permissions/api_permission_set.h" #include "extensions/common/manifest.h" +#include "extensions/common/permissions/api_permission.h" +#include "extensions/common/permissions/api_permission_set.h" #include "extensions/common/permissions/permission_message.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 9cbd689..a2fa1d0 100644 --- a/chrome/common/extensions/permissions/permission_set_unittest.cc +++ b/chrome/common/extensions/permissions/permission_set_unittest.cc @@ -14,9 +14,9 @@ #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/permissions_info.h" #include "chrome/common/extensions/permissions/socket_permission.h" #include "extensions/common/error_utils.h" +#include "extensions/common/permissions/permissions_info.h" #include "testing/gtest/include/gtest/gtest.h" using extension_test_util::LoadManifest; diff --git a/chrome/common/extensions/permissions/permissions_data.cc b/chrome/common/extensions/permissions/permissions_data.cc index 0e8adc6..817259f 100644 --- a/chrome/common/extensions/permissions/permissions_data.cc +++ b/chrome/common/extensions/permissions/permissions_data.cc @@ -12,10 +12,8 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/api_permission_set.h" #include "chrome/common/extensions/permissions/chrome_scheme_hosts.h" #include "chrome/common/extensions/permissions/permission_set.h" -#include "chrome/common/extensions/permissions/permissions_info.h" #include "content/public/common/url_constants.h" #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" @@ -24,6 +22,8 @@ #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/permissions/api_permission_set.h" +#include "extensions/common/permissions/permissions_info.h" #include "extensions/common/switches.h" #include "extensions/common/url_pattern_set.h" #include "extensions/common/user_script.h" diff --git a/chrome/common/extensions/permissions/permissions_data.h b/chrome/common/extensions/permissions/permissions_data.h index 8ca7e63..60534ec 100644 --- a/chrome/common/extensions/permissions/permissions_data.h +++ b/chrome/common/extensions/permissions/permissions_data.h @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/synchronization/lock.h" -#include "chrome/common/extensions/permissions/api_permission.h" +#include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/permission_message.h" class GURL; diff --git a/chrome/common/extensions/permissions/permissions_data_unittest.cc b/chrome/common/extensions/permissions/permissions_data_unittest.cc index 1fc56c5..92ec84c 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/api_permission.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" @@ -20,6 +19,7 @@ #include "extensions/common/error_utils.h" #include "extensions/common/id_util.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/permissions/api_permission.h" #include "extensions/common/switches.h" #include "extensions/common/url_pattern_set.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/permissions/set_disjunction_permission.h b/chrome/common/extensions/permissions/set_disjunction_permission.h index dd6f9b3..97388ba 100644 --- a/chrome/common/extensions/permissions/set_disjunction_permission.h +++ b/chrome/common/extensions/permissions/set_disjunction_permission.h @@ -12,7 +12,7 @@ #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/extensions/permissions/api_permission.h" +#include "extensions/common/permissions/api_permission.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_utils.h" diff --git a/chrome/common/extensions/permissions/socket_permission.cc b/chrome/common/extensions/permissions/socket_permission.cc index 9f2c35c..d640cbe 100644 --- a/chrome/common/extensions/permissions/socket_permission.cc +++ b/chrome/common/extensions/permissions/socket_permission.cc @@ -9,8 +9,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/common/extensions/permissions/permissions_info.h" #include "chrome/common/extensions/permissions/set_disjunction_permission.h" +#include "extensions/common/permissions/permissions_info.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/permissions/socket_permission.h b/chrome/common/extensions/permissions/socket_permission.h index a3bc4f3..5f3373e 100644 --- a/chrome/common/extensions/permissions/socket_permission.h +++ b/chrome/common/extensions/permissions/socket_permission.h @@ -7,9 +7,9 @@ #include <string> -#include "chrome/common/extensions/permissions/api_permission.h" #include "chrome/common/extensions/permissions/set_disjunction_permission.h" #include "chrome/common/extensions/permissions/socket_permission_data.h" +#include "extensions/common/permissions/api_permission.h" namespace extensions { diff --git a/chrome/common/extensions/permissions/socket_permission_data.cc b/chrome/common/extensions/permissions/socket_permission_data.cc index e87fd84..b110cb50 100644 --- a/chrome/common/extensions/permissions/socket_permission_data.cc +++ b/chrome/common/extensions/permissions/socket_permission_data.cc @@ -13,8 +13,8 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "chrome/common/extensions/permissions/api_permission.h" #include "chrome/common/extensions/permissions/socket_permission.h" +#include "extensions/common/permissions/api_permission.h" #include "url/url_canon.h" namespace { diff --git a/chrome/common/extensions/permissions/socket_permission_data.h b/chrome/common/extensions/permissions/socket_permission_data.h index d647568..8eeee16 100644 --- a/chrome/common/extensions/permissions/socket_permission_data.h +++ b/chrome/common/extensions/permissions/socket_permission_data.h @@ -6,8 +6,8 @@ #include <string> -#include "chrome/common/extensions/permissions/api_permission.h" #include "chrome/common/extensions/permissions/socket_permission_entry.h" +#include "extensions/common/permissions/api_permission.h" #include "ipc/ipc_param_traits.h" template <class T> struct FuzzTraits; diff --git a/chrome/common/extensions/permissions/socket_permission_entry.cc b/chrome/common/extensions/permissions/socket_permission_entry.cc index 17f2ef7..9d9eeea 100644 --- a/chrome/common/extensions/permissions/socket_permission_entry.cc +++ b/chrome/common/extensions/permissions/socket_permission_entry.cc @@ -13,8 +13,8 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "chrome/common/extensions/permissions/api_permission.h" #include "chrome/common/extensions/permissions/socket_permission.h" +#include "extensions/common/permissions/api_permission.h" #include "url/url_canon.h" namespace { diff --git a/chrome/common/extensions/permissions/socket_permission_unittest.cc b/chrome/common/extensions/permissions/socket_permission_unittest.cc index 8d75d73..78bd818 100644 --- a/chrome/common/extensions/permissions/socket_permission_unittest.cc +++ b/chrome/common/extensions/permissions/socket_permission_unittest.cc @@ -6,9 +6,9 @@ #include "base/pickle.h" #include "base/values.h" -#include "chrome/common/extensions/permissions/permissions_info.h" #include "chrome/common/extensions/permissions/socket_permission.h" #include "chrome/common/extensions/permissions/socket_permission_data.h" +#include "extensions/common/permissions/permissions_info.h" #include "ipc/ipc_message.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/permissions/usb_device_permission.cc b/chrome/common/extensions/permissions/usb_device_permission.cc index ef832c1..3c13936 100644 --- a/chrome/common/extensions/permissions/usb_device_permission.cc +++ b/chrome/common/extensions/permissions/usb_device_permission.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/common/extensions/permissions/permissions_info.h" +#include "extensions/common/permissions/permissions_info.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/permissions/usb_device_permission.h b/chrome/common/extensions/permissions/usb_device_permission.h index 211b8ef..3e599f0 100644 --- a/chrome/common/extensions/permissions/usb_device_permission.h +++ b/chrome/common/extensions/permissions/usb_device_permission.h @@ -6,9 +6,9 @@ #define CHROME_COMMON_EXTENSIONS_PERMISSIONS_USB_DEVICE_PERMISSION_H_ #include "base/basictypes.h" -#include "chrome/common/extensions/permissions/api_permission.h" #include "chrome/common/extensions/permissions/set_disjunction_permission.h" #include "chrome/common/extensions/permissions/usb_device_permission_data.h" +#include "extensions/common/permissions/api_permission.h" namespace extensions { diff --git a/chrome/common/extensions/permissions/usb_device_permission_data.cc b/chrome/common/extensions/permissions/usb_device_permission_data.cc index ef94376..9cf32ba 100644 --- a/chrome/common/extensions/permissions/usb_device_permission_data.cc +++ b/chrome/common/extensions/permissions/usb_device_permission_data.cc @@ -12,8 +12,8 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/values.h" -#include "chrome/common/extensions/permissions/api_permission.h" #include "chrome/common/extensions/permissions/usb_device_permission.h" +#include "extensions/common/permissions/api_permission.h" namespace { diff --git a/chrome/common/extensions/permissions/usb_device_permission_data.h b/chrome/common/extensions/permissions/usb_device_permission_data.h index 30d86e881..c326371 100644 --- a/chrome/common/extensions/permissions/usb_device_permission_data.h +++ b/chrome/common/extensions/permissions/usb_device_permission_data.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "chrome/common/extensions/permissions/api_permission.h" +#include "extensions/common/permissions/api_permission.h" namespace base { diff --git a/chrome/common/extensions/permissions/usb_device_permission_unittest.cc b/chrome/common/extensions/permissions/usb_device_permission_unittest.cc index 3f7e0b8..a42ad3b 100644 --- a/chrome/common/extensions/permissions/usb_device_permission_unittest.cc +++ b/chrome/common/extensions/permissions/usb_device_permission_unittest.cc @@ -9,10 +9,10 @@ #include "base/pickle.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/extensions/permissions/api_permission.h" -#include "chrome/common/extensions/permissions/permissions_info.h" #include "chrome/common/extensions/permissions/usb_device_permission.h" #include "chrome/common/extensions/permissions/usb_device_permission_data.h" +#include "extensions/common/permissions/api_permission.h" +#include "extensions/common/permissions/permissions_info.h" #include "ipc/ipc_message.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/renderer/chrome_render_view_observer.h b/chrome/renderer/chrome_render_view_observer.h index b556e46..b661eaa 100644 --- a/chrome/renderer/chrome_render_view_observer.h +++ b/chrome/renderer/chrome_render_view_observer.h @@ -13,9 +13,9 @@ #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/timer/timer.h" -#include "chrome/common/extensions/permissions/api_permission.h" #include "content/public/common/top_controls_state.h" #include "content/public/renderer/render_view_observer.h" +#include "extensions/common/permissions/api_permission.h" #include "third_party/WebKit/public/web/WebPermissionClient.h" #include "ui/gfx/size.h" #include "url/gurl.h" diff --git a/extensions/DEPS b/extensions/DEPS index 850ea19..14eae2f 100644 --- a/extensions/DEPS +++ b/extensions/DEPS @@ -9,5 +9,9 @@ include_rules = [ specific_include_rules = { ".*test\.cc": [ "+content/public/test", - ] + ], + "api_permission_set_unittest\.cc": [ + # Temporary include for tests. + "+chrome/common/extensions/extension_messages.h", + ], } diff --git a/chrome/common/extensions/permissions/api_permission.cc b/extensions/common/permissions/api_permission.cc index d6a365e..f183ed2 100644 --- a/chrome/common/extensions/permissions/api_permission.cc +++ b/extensions/common/permissions/api_permission.cc @@ -1,8 +1,8 @@ -// 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. -#include "chrome/common/extensions/permissions/api_permission.h" +#include "extensions/common/permissions/api_permission.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/permissions/api_permission.h b/extensions/common/permissions/api_permission.h index 1debe6e..6fbe479 100644 --- a/chrome/common/extensions/permissions/api_permission.h +++ b/extensions/common/permissions/api_permission.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_API_PERMISSION_H_ -#define CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_H_ +#ifndef EXTENSIONS_COMMON_PERMISSIONS_API_PERMISSION_H_ +#define EXTENSIONS_COMMON_PERMISSIONS_API_PERMISSION_H_ #include <map> #include <set> @@ -330,4 +330,4 @@ class APIPermissionInfo { } // namespace extensions -#endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_H_ +#endif // EXTENSIONS_COMMON_PERMISSIONS_API_PERMISSION_H_ diff --git a/chrome/common/extensions/permissions/api_permission_set.cc b/extensions/common/permissions/api_permission_set.cc index e3e46b3..ebaf8d8 100644 --- a/chrome/common/extensions/permissions/api_permission_set.cc +++ b/extensions/common/permissions/api_permission_set.cc @@ -1,16 +1,16 @@ -// 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. -#include "chrome/common/extensions/permissions/api_permission_set.h" +#include "extensions/common/permissions/api_permission_set.h" #include "base/logging.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" -#include "chrome/common/extensions/permissions/permissions_info.h" #include "extensions/common/error_utils.h" #include "extensions/common/manifest_constants.h" +#include "extensions/common/permissions/permissions_info.h" namespace extensions { diff --git a/chrome/common/extensions/permissions/api_permission_set.h b/extensions/common/permissions/api_permission_set.h index c3ef583..9b6f26d 100644 --- a/chrome/common/extensions/permissions/api_permission_set.h +++ b/extensions/common/permissions/api_permission_set.h @@ -1,15 +1,15 @@ -// 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_API_PERMISSION_SET_H_ -#define CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_SET_H_ +#ifndef EXTENSIONS_COMMON_PERMISSIONS_API_PERMISSION_SET_H_ +#define EXTENSIONS_COMMON_PERMISSIONS_API_PERMISSION_SET_H_ #include <iterator> #include <map> #include "base/memory/linked_ptr.h" -#include "chrome/common/extensions/permissions/api_permission.h" +#include "extensions/common/permissions/api_permission.h" namespace base { class ListValue; @@ -170,4 +170,4 @@ class APIPermissionSet { } // namespace extensions -#endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_API_PERMISSION_SET_H_ +#endif // EXTENSIONS_COMMON_PERMISSIONS_API_PERMISSION_SET_H_ diff --git a/chrome/common/extensions/permissions/api_permission_set_unittest.cc b/extensions/common/permissions/api_permission_set_unittest.cc index ae4b3be..85f8ccc 100644 --- a/chrome/common/extensions/permissions/api_permission_set_unittest.cc +++ b/extensions/common/permissions/api_permission_set_unittest.cc @@ -1,12 +1,12 @@ -// 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. #include "base/pickle.h" #include "base/values.h" #include "chrome/common/extensions/extension_messages.h" -#include "chrome/common/extensions/permissions/api_permission_set.h" -#include "chrome/common/extensions/permissions/permissions_info.h" +#include "extensions/common/permissions/api_permission_set.h" +#include "extensions/common/permissions/permissions_info.h" #include "ipc/ipc_message.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/permissions/permissions_info.cc b/extensions/common/permissions/permissions_info.cc index ec251e8..bac3d9c1 100644 --- a/chrome/common/extensions/permissions/permissions_info.cc +++ b/extensions/common/permissions/permissions_info.cc @@ -1,8 +1,8 @@ -// 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. -#include "chrome/common/extensions/permissions/permissions_info.h" +#include "extensions/common/permissions/permissions_info.h" #include "base/lazy_instance.h" #include "base/logging.h" diff --git a/chrome/common/extensions/permissions/permissions_info.h b/extensions/common/permissions/permissions_info.h index c459c2b..9be7e6d 100644 --- a/chrome/common/extensions/permissions/permissions_info.h +++ b/extensions/common/permissions/permissions_info.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_PERMISSIONS_INFO_H_ -#define CHROME_COMMON_EXTENSIONS_PERMISSIONS_PERMISSIONS_INFO_H_ +#ifndef EXTENSIONS_COMMON_PERMISSIONS_PERMISSIONS_INFO_H_ +#define EXTENSIONS_COMMON_PERMISSIONS_PERMISSIONS_INFO_H_ #include <map> #include <set> @@ -11,8 +11,8 @@ #include "base/callback.h" #include "base/lazy_instance.h" -#include "chrome/common/extensions/permissions/api_permission.h" -#include "chrome/common/extensions/permissions/api_permission_set.h" +#include "extensions/common/permissions/api_permission.h" +#include "extensions/common/permissions/api_permission_set.h" #include "extensions/common/permissions/permission_message.h" #include "extensions/common/permissions/permissions_provider.h" @@ -78,4 +78,4 @@ class PermissionsInfo { } // namespace extensions -#endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_PERMISSIONS_INFO_H_ +#endif // EXTENSIONS_COMMON_PERMISSIONS_PERMISSIONS_INFO_H_ diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index b9e1f209..6c4b3e2 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -64,8 +64,14 @@ 'common/matcher/url_matcher_helpers.h', 'common/one_shot_event.cc', 'common/one_shot_event.h', + 'common/permissions/api_permission.cc', + 'common/permissions/api_permission.h', + 'common/permissions/api_permission_set.cc', + 'common/permissions/api_permission_set.h', 'common/permissions/permission_message.cc', 'common/permissions/permission_message.h', + 'common/permissions/permissions_info.cc', + 'common/permissions/permissions_info.h', 'common/permissions/permissions_provider.h', 'common/stack_frame.cc', 'common/stack_frame.h', |