diff options
54 files changed, 242 insertions, 250 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index ed45cd2..870b877 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -90,7 +90,6 @@ #include "chrome/common/env_vars.h" #include "chrome/common/extensions/extension_process_policy.h" #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" -#include "chrome/common/extensions/permissions/socket_permission.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/pepper_permission_util.h" #include "chrome/common/pref_names.h" @@ -138,6 +137,7 @@ #include "extensions/common/manifest_handlers/shared_module_info.h" #include "extensions/common/manifest_handlers/web_accessible_resources_info.h" #include "extensions/common/permissions/permissions_data.h" +#include "extensions/common/permissions/socket_permission.h" #include "extensions/common/switches.h" #include "grit/generated_resources.h" #include "grit/ui_resources.h" diff --git a/chrome/browser/extensions/api/hid/hid_api.cc b/chrome/browser/extensions/api/hid/hid_api.cc index 11d559a..df184e5 100644 --- a/chrome/browser/extensions/api/hid/hid_api.cc +++ b/chrome/browser/extensions/api/hid/hid_api.cc @@ -8,12 +8,12 @@ #include <vector> #include "chrome/common/extensions/api/hid.h" -#include "chrome/common/extensions/permissions/usb_device_permission.h" #include "device/hid/hid_connection.h" #include "device/hid/hid_device_info.h" #include "device/hid/hid_service.h" #include "extensions/browser/api/api_resource_manager.h" #include "extensions/common/permissions/permissions_data.h" +#include "extensions/common/permissions/usb_device_permission.h" #include "net/base/io_buffer.h" namespace hid = extensions::api::hid; 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 7d07dec..6e16654 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc @@ -34,7 +34,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/chrome_select_file_policy.h" #include "chrome/common/extensions/api/media_galleries.h" -#include "chrome/common/extensions/permissions/media_galleries_permission.h" #include "chrome/common/pref_names.h" #include "components/storage_monitor/storage_info.h" #include "components/web_modal/web_contents_modal_dialog_manager.h" @@ -49,6 +48,7 @@ #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/api_permission.h" +#include "extensions/common/permissions/media_galleries_permission.h" #include "extensions/common/permissions/permissions_data.h" #include "grit/generated_resources.h" #include "net/base/mime_sniffer.h" diff --git a/chrome/browser/extensions/api/messaging/message_service.h b/chrome/browser/extensions/api/messaging/message_service.h index d5693f2..704a4d4 100644 --- a/chrome/browser/extensions/api/messaging/message_service.h +++ b/chrome/browser/extensions/api/messaging/message_service.h @@ -15,10 +15,10 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/extensions/api/messaging/message_property_provider.h" #include "chrome/browser/extensions/api/messaging/native_message_process_host.h" -#include "chrome/common/extensions/api/messaging/message.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "extensions/browser/browser_context_keyed_api_factory.h" +#include "extensions/common/api/messaging/message.h" class GURL; class Profile; diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc index fd70ba7..0caa191 100644 --- a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc +++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc @@ -8,11 +8,11 @@ #include "base/json/json_writer.h" #include "base/values.h" #include "chrome/common/extensions/api/permissions.h" -#include "chrome/common/extensions/permissions/usb_device_permission.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_info.h" +#include "extensions/common/permissions/usb_device_permission.h" #include "extensions/common/url_pattern_set.h" using extensions::APIPermission; diff --git a/chrome/browser/extensions/api/usb/usb_api.cc b/chrome/browser/extensions/api/usb/usb_api.cc index 4d2e46e..0d23ae9 100644 --- a/chrome/browser/extensions/api/usb/usb_api.cc +++ b/chrome/browser/extensions/api/usb/usb_api.cc @@ -13,9 +13,9 @@ #include "chrome/browser/usb/usb_device_handle.h" #include "chrome/browser/usb/usb_service.h" #include "chrome/common/extensions/api/usb.h" -#include "chrome/common/extensions/permissions/usb_device_permission.h" #include "extensions/browser/extension_system.h" #include "extensions/common/permissions/permissions_data.h" +#include "extensions/common/permissions/usb_device_permission.h" namespace usb = extensions::api::usb; namespace BulkTransfer = usb::BulkTransfer; diff --git a/chrome/browser/extensions/chrome_extension_web_contents_observer.cc b/chrome/browser/extensions/chrome_extension_web_contents_observer.cc index 088338b..0723139 100644 --- a/chrome/browser/extensions/chrome_extension_web_contents_observer.cc +++ b/chrome/browser/extensions/chrome_extension_web_contents_observer.cc @@ -7,13 +7,13 @@ #include "chrome/browser/extensions/api/messaging/message_service.h" #include "chrome/browser/extensions/error_console/error_console.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/common/extensions/api/messaging/message.h" #include "chrome/common/render_messages.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" +#include "extensions/common/api/messaging/message.h" #include "extensions/common/extension_messages.h" #include "extensions/common/extension_urls.h" diff --git a/chrome/browser/media_galleries/media_galleries_dialog_controller.cc b/chrome/browser/media_galleries/media_galleries_dialog_controller.cc index 033aa5e..1e9b5f7 100644 --- a/chrome/browser/media_galleries/media_galleries_dialog_controller.cc +++ b/chrome/browser/media_galleries/media_galleries_dialog_controller.cc @@ -15,13 +15,13 @@ #include "chrome/browser/media_galleries/media_gallery_context_menu.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/chrome_select_file_policy.h" -#include "chrome/common/extensions/permissions/media_galleries_permission.h" #include "components/storage_monitor/storage_info.h" #include "components/storage_monitor/storage_monitor.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" +#include "extensions/common/permissions/media_galleries_permission.h" #include "extensions/common/permissions/permissions_data.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/media_galleries/media_galleries_dialog_controller_unittest.cc b/chrome/browser/media_galleries/media_galleries_dialog_controller_unittest.cc index a725f84..9dfc9bb 100644 --- a/chrome/browser/media_galleries/media_galleries_dialog_controller_unittest.cc +++ b/chrome/browser/media_galleries/media_galleries_dialog_controller_unittest.cc @@ -13,11 +13,11 @@ #include "chrome/browser/media_galleries/media_galleries_dialog_controller.h" #include "chrome/browser/media_galleries/media_galleries_preferences.h" #include "chrome/browser/media_galleries/media_galleries_test_util.h" -#include "chrome/common/extensions/permissions/media_galleries_permission.h" #include "chrome/test/base/testing_profile.h" #include "components/storage_monitor/storage_info.h" #include "components/storage_monitor/test_storage_monitor.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "extensions/common/permissions/media_galleries_permission.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/media_galleries/media_galleries_preferences.cc b/chrome/browser/media_galleries/media_galleries_preferences.cc index 070b464..e5b05ae 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences.cc @@ -24,7 +24,6 @@ #include "chrome/browser/media_galleries/media_galleries_histograms.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/extensions/permissions/media_galleries_permission.h" #include "chrome/common/pref_names.h" #include "components/storage_monitor/media_storage_util.h" #include "components/storage_monitor/storage_monitor.h" @@ -35,6 +34,7 @@ #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" #include "extensions/common/permissions/api_permission.h" +#include "extensions/common/permissions/media_galleries_permission.h" #include "extensions/common/permissions/permissions_data.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc index 01602e9..b6be64a4 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc @@ -15,7 +15,6 @@ #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/browser/media_galleries/media_file_system_registry.h" #include "chrome/browser/media_galleries/media_galleries_test_util.h" -#include "chrome/common/extensions/permissions/media_galleries_permission.h" #include "chrome/test/base/testing_profile.h" #include "components/storage_monitor/media_storage_util.h" #include "components/storage_monitor/storage_monitor.h" @@ -24,6 +23,7 @@ #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/background_info.h" +#include "extensions/common/permissions/media_galleries_permission.h" #include "grit/generated_resources.h" #include "sync/api/string_ordinal.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller.cc b/chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller.cc index dc252c9..f047886 100644 --- a/chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller.cc +++ b/chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller.cc @@ -18,11 +18,11 @@ #include "chrome/browser/media_galleries/media_gallery_context_menu.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/common/extensions/permissions/media_galleries_permission.h" #include "components/storage_monitor/storage_info.h" #include "components/storage_monitor/storage_monitor.h" #include "content/public/browser/web_contents.h" #include "extensions/common/extension.h" +#include "extensions/common/permissions/media_galleries_permission.h" #include "extensions/common/permissions/permissions_data.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller_unittest.cc b/chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller_unittest.cc index 6e14ef8..6653030 100644 --- a/chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller_unittest.cc +++ b/chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller_unittest.cc @@ -15,12 +15,12 @@ #include "chrome/browser/media_galleries/media_galleries_preferences.h" #include "chrome/browser/media_galleries/media_galleries_scan_result_dialog_controller.h" #include "chrome/browser/media_galleries/media_galleries_test_util.h" -#include "chrome/common/extensions/permissions/media_galleries_permission.h" #include "chrome/test/base/testing_profile.h" #include "components/storage_monitor/test_storage_monitor.h" #include "content/public/test/test_browser_thread_bundle.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" +#include "extensions/common/permissions/media_galleries_permission.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/media_galleries/media_scan_manager_unittest.cc b/chrome/browser/media_galleries/media_scan_manager_unittest.cc index c582951..5ab0c4e 100644 --- a/chrome/browser/media_galleries/media_scan_manager_unittest.cc +++ b/chrome/browser/media_galleries/media_scan_manager_unittest.cc @@ -18,12 +18,12 @@ #include "chrome/browser/media_galleries/media_galleries_test_util.h" #include "chrome/browser/media_galleries/media_scan_manager.h" #include "chrome/browser/media_galleries/media_scan_manager_observer.h" -#include "chrome/common/extensions/permissions/media_galleries_permission.h" #include "chrome/test/base/testing_profile.h" #include "components/storage_monitor/test_storage_monitor.h" #include "content/public/test/test_browser_thread_bundle.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" +#include "extensions/common/permissions/media_galleries_permission.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_CHROMEOS) diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 8d8c7f1..f0ded4e 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -141,7 +141,6 @@ 'common/extensions/api/managed_mode_private/managed_mode_handler.h', 'common/extensions/api/media_galleries_private/media_galleries_handler.h', 'common/extensions/api/media_galleries_private/media_galleries_handler.cc', - 'common/extensions/api/messaging/message.h', 'common/extensions/api/omnibox/omnibox_handler.cc', 'common/extensions/api/omnibox/omnibox_handler.h', 'common/extensions/api/plugins/plugins_handler.cc', @@ -226,25 +225,6 @@ 'common/extensions/permissions/chrome_api_permissions.h', 'common/extensions/permissions/chrome_permission_message_provider.cc', 'common/extensions/permissions/chrome_permission_message_provider.h', - 'common/extensions/permissions/media_galleries_permission.cc', - 'common/extensions/permissions/media_galleries_permission.h', - 'common/extensions/permissions/media_galleries_permission_data.cc', - '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/set_disjunction_permission.h', - 'common/extensions/permissions/settings_override_permission.cc', - 'common/extensions/permissions/settings_override_permission.h', - 'common/extensions/permissions/socket_permission.cc', - 'common/extensions/permissions/socket_permission.h', - 'common/extensions/permissions/socket_permission_data.cc', - 'common/extensions/permissions/socket_permission_data.h', - 'common/extensions/permissions/socket_permission_entry.cc', - 'common/extensions/permissions/socket_permission_entry.h', - 'common/extensions/permissions/usb_device_permission.cc', - 'common/extensions/permissions/usb_device_permission.h', - 'common/extensions/permissions/usb_device_permission_data.cc', - 'common/extensions/permissions/usb_device_permission_data.h', 'common/extensions/sync_helper.cc', 'common/extensions/sync_helper.h', 'common/extensions/update_manifest.cc', diff --git a/chrome/common/extensions/api/sockets/sockets_manifest_permission.h b/chrome/common/extensions/api/sockets/sockets_manifest_permission.h index 92112c0..625cbeb 100644 --- a/chrome/common/extensions/api/sockets/sockets_manifest_permission.h +++ b/chrome/common/extensions/api/sockets/sockets_manifest_permission.h @@ -8,9 +8,9 @@ #include <set> #include <vector> -#include "chrome/common/extensions/permissions/socket_permission_entry.h" #include "extensions/common/install_warning.h" #include "extensions/common/permissions/manifest_permission.h" +#include "extensions/common/permissions/socket_permission_entry.h" namespace content { struct SocketPermissionRequest; diff --git a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc index 772c6e2..072bdec 100644 --- a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc +++ b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc @@ -9,7 +9,6 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "chrome/common/extensions/permissions/settings_override_permission.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension_messages.h" #include "extensions/common/feature_switch.h" @@ -18,6 +17,7 @@ #include "extensions/common/permissions/manifest_permission.h" #include "extensions/common/permissions/permissions_data.h" #include "extensions/common/permissions/permissions_info.h" +#include "extensions/common/permissions/settings_override_permission.h" #include "grit/generated_resources.h" #include "ipc/ipc_message.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/permissions/chrome_api_permissions.cc b/chrome/common/extensions/permissions/chrome_api_permissions.cc index f05dc67..6696790 100644 --- a/chrome/common/extensions/permissions/chrome_api_permissions.cc +++ b/chrome/common/extensions/permissions/chrome_api_permissions.cc @@ -4,13 +4,13 @@ #include "chrome/common/extensions/permissions/chrome_api_permissions.h" -#include "chrome/common/extensions/permissions/media_galleries_permission.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/media_galleries_permission.h" #include "extensions/common/permissions/permission_message.h" #include "extensions/common/permissions/permissions_info.h" +#include "extensions/common/permissions/socket_permission.h" +#include "extensions/common/permissions/usb_device_permission.h" #include "grit/generated_resources.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 94cb2c4..69236b8 100644 --- a/chrome/common/extensions/permissions/chrome_permission_message_provider.cc +++ b/chrome/common/extensions/permissions/chrome_permission_message_provider.cc @@ -5,9 +5,9 @@ #include "chrome/common/extensions/permissions/chrome_permission_message_provider.h" #include "base/stl_util.h" -#include "chrome/common/extensions/permissions/permission_message_util.h" #include "extensions/common/extensions_client.h" #include "extensions/common/permissions/permission_message.h" +#include "extensions/common/permissions/permission_message_util.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/url_pattern_set.h" #include "grit/generated_resources.h" diff --git a/chrome/common/extensions/permissions/media_galleries_permission_unittest.cc b/chrome/common/extensions/permissions/media_galleries_permission_unittest.cc index 1006d3c..8540376 100644 --- a/chrome/common/extensions/permissions/media_galleries_permission_unittest.cc +++ b/chrome/common/extensions/permissions/media_galleries_permission_unittest.cc @@ -5,9 +5,9 @@ // These tests make sure MediaGalleriesPermission values are parsed correctly. #include "base/values.h" -#include "chrome/common/extensions/permissions/media_galleries_permission.h" -#include "chrome/common/extensions/permissions/media_galleries_permission_data.h" #include "extensions/common/permissions/api_permission.h" +#include "extensions/common/permissions/media_galleries_permission.h" +#include "extensions/common/permissions/media_galleries_permission_data.h" #include "extensions/common/permissions/permissions_info.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/chrome/common/extensions/permissions/permission_set_unittest.cc index b42fb5e..77baf5f 100644 --- a/chrome/common/extensions/permissions/permission_set_unittest.cc +++ b/chrome/common/extensions/permissions/permission_set_unittest.cc @@ -12,14 +12,14 @@ #include "chrome/common/extensions/extension_test_util.h" #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/common/extensions/permissions/chrome_permission_message_provider.h" -#include "chrome/common/extensions/permissions/permission_message_util.h" -#include "chrome/common/extensions/permissions/socket_permission.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permission_message_provider.h" +#include "extensions/common/permissions/permission_message_util.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_data.h" #include "extensions/common/permissions/permissions_info.h" +#include "extensions/common/permissions/socket_permission.h" #include "testing/gtest/include/gtest/gtest.h" using extension_test_util::LoadManifest; diff --git a/chrome/common/extensions/permissions/settings_override_permission_unittest.cc b/chrome/common/extensions/permissions/settings_override_permission_unittest.cc index c290a78..d5b9a04 100644 --- a/chrome/common/extensions/permissions/settings_override_permission_unittest.cc +++ b/chrome/common/extensions/permissions/settings_override_permission_unittest.cc @@ -8,10 +8,10 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" -#include "chrome/common/extensions/permissions/settings_override_permission.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_data.h" +#include "extensions/common/permissions/settings_override_permission.h" #include "testing/gtest/include/gtest/gtest.h" namespace extensions { diff --git a/chrome/common/extensions/permissions/socket_permission_unittest.cc b/chrome/common/extensions/permissions/socket_permission_unittest.cc index a968c46..7cb1b9f 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/socket_permission.h" -#include "chrome/common/extensions/permissions/socket_permission_data.h" #include "extensions/common/permissions/permissions_info.h" +#include "extensions/common/permissions/socket_permission.h" +#include "extensions/common/permissions/socket_permission_data.h" #include "ipc/ipc_message.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/extensions/permissions/usb_device_permission_unittest.cc b/chrome/common/extensions/permissions/usb_device_permission_unittest.cc index 2aa47f1..e64d429 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/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 "extensions/common/permissions/usb_device_permission.h" +#include "extensions/common/permissions/usb_device_permission_data.h" #include "ipc/ipc_message.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc index 8fb700f..8d83596 100644 --- a/chrome/renderer/extensions/dispatcher.cc +++ b/chrome/renderer/extensions/dispatcher.cc @@ -18,7 +18,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/crash_keys.h" -#include "chrome/common/extensions/api/messaging/message.h" #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/common/extensions/manifest_handlers/externally_connectable.h" #include "chrome/common/extensions/message_bundle.h" @@ -70,6 +69,7 @@ #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/v8_value_converter.h" +#include "extensions/common/api/messaging/message.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/extension_api.h" diff --git a/chrome/renderer/extensions/extension_helper.cc b/chrome/renderer/extensions/extension_helper.cc index 6d9cf1f..ccaf8cf 100644 --- a/chrome/renderer/extensions/extension_helper.cc +++ b/chrome/renderer/extensions/extension_helper.cc @@ -12,7 +12,6 @@ #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/extensions/api/messaging/message.h" #include "chrome/common/extensions/chrome_extension_messages.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/render_messages.h" @@ -26,6 +25,7 @@ #include "chrome/renderer/web_apps.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view_visitor.h" +#include "extensions/common/api/messaging/message.h" #include "extensions/common/constants.h" #include "extensions/common/extension_messages.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" diff --git a/chrome/renderer/extensions/messaging_bindings.cc b/chrome/renderer/extensions/messaging_bindings.cc index c7524ae..af0422b 100644 --- a/chrome/renderer/extensions/messaging_bindings.cc +++ b/chrome/renderer/extensions/messaging_bindings.cc @@ -13,7 +13,6 @@ #include "base/lazy_instance.h" #include "base/message_loop/message_loop.h" #include "base/values.h" -#include "chrome/common/extensions/api/messaging/message.h" #include "chrome/common/extensions/manifest_handlers/externally_connectable.h" #include "chrome/common/extensions/message_bundle.h" #include "chrome/common/url_constants.h" @@ -26,6 +25,7 @@ #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/v8_value_converter.h" +#include "extensions/common/api/messaging/message.h" #include "extensions/common/extension_messages.h" #include "grit/renderer_resources.h" #include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h" diff --git a/extensions/browser/DEPS b/extensions/browser/DEPS index 57b1dfc..0060709 100644 --- a/extensions/browser/DEPS +++ b/extensions/browser/DEPS @@ -20,7 +20,6 @@ include_rules = [ "+chrome/browser/renderer_host/chrome_render_message_filter.h", "+chrome/common/extensions/api/sockets/sockets_manifest_data.h", "+chrome/common/extensions/features/feature_channel.h", - "+chrome/common/extensions/permissions", "+grit/generated_resources.h", ] diff --git a/extensions/browser/api/socket/socket_api.cc b/extensions/browser/api/socket/socket_api.cc index 34a5517..dbe7a87 100644 --- a/extensions/browser/api/socket/socket_api.cc +++ b/extensions/browser/api/socket/socket_api.cc @@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/containers/hash_tables.h" #include "chrome/browser/extensions/api/dns/host_resolver_wrapper.h" -#include "chrome/common/extensions/permissions/socket_permission.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/resource_context.h" #include "extensions/browser/api/socket/socket.h" @@ -18,6 +17,7 @@ #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permissions_data.h" +#include "extensions/common/permissions/socket_permission.h" #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" diff --git a/extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.cc b/extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.cc index 6adc0fc..4a0c8e6e 100644 --- a/extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.cc +++ b/extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.cc @@ -5,11 +5,11 @@ #include "extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.h" #include "chrome/common/extensions/api/sockets/sockets_manifest_data.h" -#include "chrome/common/extensions/permissions/socket_permission.h" #include "content/public/common/socket_permission_request.h" #include "extensions/browser/api/socket/tcp_socket.h" #include "extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.h" #include "extensions/common/permissions/permissions_data.h" +#include "extensions/common/permissions/socket_permission.h" #include "net/base/net_errors.h" using content::SocketPermissionRequest; diff --git a/extensions/common/DEPS b/extensions/common/DEPS index c75b833..12baab5 100644 --- a/extensions/common/DEPS +++ b/extensions/common/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+device/usb", "+net", "+third_party/re2", @@ -9,8 +10,6 @@ include_rules = [ # # TODO(benwells): Remove these. http://crbug.com/162530 "+chrome/common/extensions/api/generated_schemas.h", - "+chrome/common/extensions/api/messaging/message.h", - "+chrome/common/extensions/permissions", "+grit/chromium_strings.h", "+grit/common_resources.h", "+grit/extensions_api_resources.h", diff --git a/chrome/common/extensions/api/messaging/message.h b/extensions/common/api/messaging/message.h index 5a03224..64ecb82 100644 --- a/chrome/common/extensions/api/messaging/message.h +++ b/extensions/common/api/messaging/message.h @@ -1,13 +1,13 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 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_API_MESSAGING_MESSAGE_H_ -#define CHROME_COMMON_EXTENSIONS_API_MESSAGING_MESSAGE_H_ +#ifndef EXTENSIONS_COMMON_API_MESSAGING_MESSAGE_H_ +#define EXTENSIONS_COMMON_API_MESSAGING_MESSAGE_H_ namespace extensions { -// A message consists of both the data itself as well as a user gestur e state. +// A message consists of both the data itself as well as a user gesture state. struct Message { std::string data; bool user_gesture; @@ -19,4 +19,4 @@ struct Message { } // namespace extensions -#endif // CHROME_COMMON_EXTENSIONS_API_MESSAGING_MESSAGE_H_ +#endif // EXTENSIONS_COMMON_API_MESSAGING_MESSAGE_H_ diff --git a/extensions/common/extension_messages.h b/extensions/common/extension_messages.h index f5c2817..b7ce195 100644 --- a/extensions/common/extension_messages.h +++ b/extensions/common/extension_messages.h @@ -10,16 +10,16 @@ #include "base/memory/shared_memory.h" #include "base/values.h" -#include "chrome/common/extensions/api/messaging/message.h" -#include "chrome/common/extensions/permissions/media_galleries_permission_data.h" -#include "chrome/common/extensions/permissions/socket_permission_data.h" -#include "chrome/common/extensions/permissions/usb_device_permission_data.h" #include "content/public/common/common_param_traits.h" #include "content/public/common/socket_permission_request.h" +#include "extensions/common/api/messaging/message.h" #include "extensions/common/draggable_region.h" #include "extensions/common/extension.h" #include "extensions/common/extensions_client.h" +#include "extensions/common/permissions/media_galleries_permission_data.h" #include "extensions/common/permissions/permission_set.h" +#include "extensions/common/permissions/socket_permission_data.h" +#include "extensions/common/permissions/usb_device_permission_data.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/permissions/media_galleries_permission.cc b/extensions/common/permissions/media_galleries_permission.cc index 8c87bf3..baf7162 100644 --- a/chrome/common/extensions/permissions/media_galleries_permission.cc +++ b/extensions/common/permissions/media_galleries_permission.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 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/media_galleries_permission.h" +#include "extensions/common/permissions/media_galleries_permission.h" #include <set> #include <string> diff --git a/chrome/common/extensions/permissions/media_galleries_permission.h b/extensions/common/permissions/media_galleries_permission.h index 33e6d0f..36b6dba 100644 --- a/chrome/common/extensions/permissions/media_galleries_permission.h +++ b/extensions/common/permissions/media_galleries_permission.h @@ -1,14 +1,14 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 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_MEDIA_GALLERIES_PERMISSION_H_ -#define CHROME_COMMON_EXTENSIONS_PERMISSIONS_MEDIA_GALLERIES_PERMISSION_H_ +#ifndef EXTENSIONS_COMMON_PERMISSIONS_MEDIA_GALLERIES_PERMISSION_H_ +#define EXTENSIONS_COMMON_PERMISSIONS_MEDIA_GALLERIES_PERMISSION_H_ #include "base/basictypes.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" +#include "extensions/common/permissions/media_galleries_permission_data.h" +#include "extensions/common/permissions/set_disjunction_permission.h" namespace extensions { @@ -53,4 +53,4 @@ class MediaGalleriesPermission } // namespace extensions -#endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_MEDIA_GALLERIES_PERMISSION_H_ +#endif // EXTENSIONS_COMMON_PERMISSIONS_MEDIA_GALLERIES_PERMISSION_H_ diff --git a/chrome/common/extensions/permissions/media_galleries_permission_data.cc b/extensions/common/permissions/media_galleries_permission_data.cc index fd8a9da..d7e7937 100644 --- a/chrome/common/extensions/permissions/media_galleries_permission_data.cc +++ b/extensions/common/permissions/media_galleries_permission_data.cc @@ -1,12 +1,12 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 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/media_galleries_permission_data.h" +#include "extensions/common/permissions/media_galleries_permission_data.h" #include "base/strings/string_util.h" #include "base/values.h" -#include "chrome/common/extensions/permissions/media_galleries_permission.h" +#include "extensions/common/permissions/media_galleries_permission.h" namespace extensions { diff --git a/chrome/common/extensions/permissions/media_galleries_permission_data.h b/extensions/common/permissions/media_galleries_permission_data.h index 9d13eae..920a905 100644 --- a/chrome/common/extensions/permissions/media_galleries_permission_data.h +++ b/extensions/common/permissions/media_galleries_permission_data.h @@ -1,9 +1,9 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 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_MEDIA_GALLERIES_PERMISSION_DATA_H_ -#define CHROME_COMMON_EXTENSIONS_PERMISSIONS_MEDIA_GALLERIES_PERMISSION_DATA_H_ +#ifndef EXTENSIONS_COMMON_PERMISSIONS_MEDIA_GALLERIES_PERMISSION_DATA_H_ +#define EXTENSIONS_COMMON_PERMISSIONS_MEDIA_GALLERIES_PERMISSION_DATA_H_ #include <string> @@ -48,4 +48,4 @@ class MediaGalleriesPermissionData { } // namespace extensions -#endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_MEDIA_GALLERIES_PERMISSION_DATA_H_ +#endif // EXTENSIONS_COMMON_PERMISSIONS_MEDIA_GALLERIES_PERMISSION_DATA_H_ diff --git a/chrome/common/extensions/permissions/permission_message_util.cc b/extensions/common/permissions/permission_message_util.cc index f881eed..76d1c61 100644 --- a/chrome/common/extensions/permissions/permission_message_util.cc +++ b/extensions/common/permissions/permission_message_util.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 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_message_util.h" +#include "extensions/common/permissions/permission_message_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" @@ -72,8 +72,7 @@ PermissionMessage CreateFromHostList(const std::set<std::string>& hosts) { IDS_EXTENSION_PROMPT_WARNING_HOSTS_ZERO, IDS_EXTENSION_PROMPT_WARNING_HOSTS_TWO, IDS_EXTENSION_PROMPT_WARNING_HOSTS_FEW, - IDS_EXTENSION_PROMPT_WARNING_HOSTS_MANY, - }; + IDS_EXTENSION_PROMPT_WARNING_HOSTS_MANY, }; std::vector<int> message_ids; for (size_t i = 0; i < arraysize(kRetainedFilesMessageIDs); i++) { message_ids.push_back(kRetainedFilesMessageIDs[i]); @@ -92,17 +91,17 @@ PermissionMessage CreateFromHostList(const std::set<std::string>& hosts) { return PermissionMessage(message_id, message, details); } -std::set<std::string> GetDistinctHosts( - const URLPatternSet& host_patterns, - bool include_rcd, - bool exclude_file_scheme) { +std::set<std::string> GetDistinctHosts(const URLPatternSet& host_patterns, + bool include_rcd, + bool exclude_file_scheme) { // Use a vector to preserve order (also faster than a map on small sets). // Each item is a host split into two parts: host without RCDs and // current best RCD. typedef std::vector<std::pair<std::string, std::string> > HostVector; HostVector hosts_best_rcd; for (URLPatternSet::const_iterator i = host_patterns.begin(); - i != host_patterns.end(); ++i) { + i != host_patterns.end(); + ++i) { if (exclude_file_scheme && i->scheme() == content::kFileScheme) continue; @@ -142,7 +141,8 @@ std::set<std::string> GetDistinctHosts( // Build up the final vector by concatenating hosts and RCDs. std::set<std::string> distinct_hosts; for (HostVector::iterator it = hosts_best_rcd.begin(); - it != hosts_best_rcd.end(); ++it) + it != hosts_best_rcd.end(); + ++it) distinct_hosts.insert(it->first + it->second); return distinct_hosts; } diff --git a/chrome/common/extensions/permissions/permission_message_util.h b/extensions/common/permissions/permission_message_util.h index 13b41c1..410e1a2 100644 --- a/chrome/common/extensions/permissions/permission_message_util.h +++ b/extensions/common/permissions/permission_message_util.h @@ -1,9 +1,9 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 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_MESSAGE_UTIL_H_ -#define CHROME_COMMON_EXTENSIONS_PERMISSIONS_PERMISSION_MESSAGE_UTIL_H_ +#ifndef EXTENSIONS_COMMON_PERMISSIONS_PERMISSION_MESSAGE_UTIL_H_ +#define EXTENSIONS_COMMON_PERMISSIONS_PERMISSION_MESSAGE_UTIL_H_ #include <set> #include <string> @@ -28,4 +28,4 @@ std::set<std::string> GetDistinctHosts( } // namespace permission_message_util -#endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_PERMISSION_MESSAGE_UTIL_H_ +#endif // EXTENSIONS_COMMON_PERMISSIONS_PERMISSION_MESSAGE_UTIL_H_ diff --git a/extensions/common/permissions/permissions_data_unittest.cc b/extensions/common/permissions/permissions_data_unittest.cc index fda57f9..2ebc9ba 100644 --- a/extensions/common/permissions/permissions_data_unittest.cc +++ b/extensions/common/permissions/permissions_data_unittest.cc @@ -11,7 +11,6 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/extensions/extension_test_util.h" #include "chrome/common/extensions/features/feature_channel.h" -#include "chrome/common/extensions/permissions/socket_permission.h" #include "content/public/common/socket_permission_request.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" @@ -20,6 +19,7 @@ #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_data.h" +#include "extensions/common/permissions/socket_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/extensions/common/permissions/set_disjunction_permission.h index b05917f..3a3e9c5 100644 --- a/chrome/common/extensions/permissions/set_disjunction_permission.h +++ b/extensions/common/permissions/set_disjunction_permission.h @@ -1,9 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 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_SET_DISJUNCTION_PERMISSION_H_ -#define CHROME_COMMON_EXTENSIONS_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ +#ifndef EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ +#define EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ #include <algorithm> #include <set> @@ -29,20 +29,18 @@ template <class PermissionDataType, class DerivedType> class SetDisjunctionPermission : public APIPermission { public: explicit SetDisjunctionPermission(const APIPermissionInfo* info) - : APIPermission(info) { - } + : APIPermission(info) {} - ~SetDisjunctionPermission() { - } + ~SetDisjunctionPermission() {} // APIPermission overrides - virtual bool HasMessages() const OVERRIDE { - return !data_set_.empty(); - } + virtual bool HasMessages() const OVERRIDE { return !data_set_.empty(); } virtual bool Check(const APIPermission::CheckParam* param) const OVERRIDE { for (typename std::set<PermissionDataType>::const_iterator i = - data_set_.begin(); i != data_set_.end(); ++i) { + data_set_.begin(); + i != data_set_.end(); + ++i) { if (i->Check(param)) return true; } @@ -53,9 +51,10 @@ class SetDisjunctionPermission : public APIPermission { CHECK(rhs->info() == info()); const SetDisjunctionPermission* perm = static_cast<const SetDisjunctionPermission*>(rhs); - return std::includes( - data_set_.begin(), data_set_.end(), - perm->data_set_.begin(), perm->data_set_.end()); + return std::includes(data_set_.begin(), + data_set_.end(), + perm->data_set_.begin(), + perm->data_set_.end()); } virtual bool Equal(const APIPermission* rhs) const OVERRIDE { @@ -76,11 +75,12 @@ class SetDisjunctionPermission : public APIPermission { const SetDisjunctionPermission* perm = static_cast<const SetDisjunctionPermission*>(rhs); scoped_ptr<SetDisjunctionPermission> result(new DerivedType(info())); - std::set_difference( - data_set_.begin(), data_set_.end(), - perm->data_set_.begin(), perm->data_set_.end(), - std::inserter<std::set<PermissionDataType> >( - result->data_set_, result->data_set_.begin())); + std::set_difference(data_set_.begin(), + data_set_.end(), + perm->data_set_.begin(), + perm->data_set_.end(), + std::inserter<std::set<PermissionDataType> >( + result->data_set_, result->data_set_.begin())); return result->data_set_.empty() ? NULL : result.release(); } @@ -89,11 +89,12 @@ class SetDisjunctionPermission : public APIPermission { const SetDisjunctionPermission* perm = static_cast<const SetDisjunctionPermission*>(rhs); scoped_ptr<SetDisjunctionPermission> result(new DerivedType(info())); - std::set_union( - data_set_.begin(), data_set_.end(), - perm->data_set_.begin(), perm->data_set_.end(), - std::inserter<std::set<PermissionDataType> >( - result->data_set_, result->data_set_.begin())); + std::set_union(data_set_.begin(), + data_set_.end(), + perm->data_set_.begin(), + perm->data_set_.end(), + std::inserter<std::set<PermissionDataType> >( + result->data_set_, result->data_set_.begin())); return result.release(); } @@ -102,11 +103,12 @@ class SetDisjunctionPermission : public APIPermission { const SetDisjunctionPermission* perm = static_cast<const SetDisjunctionPermission*>(rhs); scoped_ptr<SetDisjunctionPermission> result(new DerivedType(info())); - std::set_intersection( - data_set_.begin(), data_set_.end(), - perm->data_set_.begin(), perm->data_set_.end(), - std::inserter<std::set<PermissionDataType> >( - result->data_set_, result->data_set_.begin())); + std::set_intersection(data_set_.begin(), + data_set_.end(), + perm->data_set_.begin(), + perm->data_set_.end(), + std::inserter<std::set<PermissionDataType> >( + result->data_set_, result->data_set_.begin())); return result->data_set_.empty() ? NULL : result.release(); } @@ -167,4 +169,4 @@ class SetDisjunctionPermission : public APIPermission { } // namespace extensions -#endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ +#endif // EXTENSIONS_COMMON_PERMISSIONS_SET_DISJUNCTION_PERMISSION_H_ diff --git a/chrome/common/extensions/permissions/settings_override_permission.cc b/extensions/common/permissions/settings_override_permission.cc index 934bf98..b58d937 100644 --- a/chrome/common/extensions/permissions/settings_override_permission.cc +++ b/extensions/common/permissions/settings_override_permission.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 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/settings_override_permission.h" +#include "extensions/common/permissions/settings_override_permission.h" #include "base/strings/utf_string_conversions.h" #include "grit/generated_resources.h" @@ -11,13 +11,11 @@ namespace extensions { SettingsOverrideAPIPermission::SettingsOverrideAPIPermission( - const APIPermissionInfo* permission, const std::string& setting_value) - : APIPermission(permission), - setting_value_(setting_value) { -} + const APIPermissionInfo* permission, + const std::string& setting_value) + : APIPermission(permission), setting_value_(setting_value) {} -SettingsOverrideAPIPermission::~SettingsOverrideAPIPermission() { -} +SettingsOverrideAPIPermission::~SettingsOverrideAPIPermission() {} bool SettingsOverrideAPIPermission::HasMessages() const { return info()->message_id() > PermissionMessage::kNone; @@ -43,10 +41,10 @@ PermissionMessages SettingsOverrideAPIPermission::GetMessages() const { NOTREACHED(); } PermissionMessages result; - result.push_back(PermissionMessage( - info()->message_id(), - l10n_util::GetStringFUTF16(string_id, - base::UTF8ToUTF16(setting_value_)))); + result.push_back( + PermissionMessage(info()->message_id(), + l10n_util::GetStringFUTF16( + string_id, base::UTF8ToUTF16(setting_value_)))); return result; } @@ -97,15 +95,13 @@ APIPermission* SettingsOverrideAPIPermission::Intersect( return new SettingsOverrideAPIPermission(info(), setting_value_); } -void SettingsOverrideAPIPermission::Write(IPC::Message* m) const { -} +void SettingsOverrideAPIPermission::Write(IPC::Message* m) const {} -bool SettingsOverrideAPIPermission::Read( - const IPC::Message* m, PickleIterator* iter) { +bool SettingsOverrideAPIPermission::Read(const IPC::Message* m, + PickleIterator* iter) { return true; } -void SettingsOverrideAPIPermission::Log(std::string* log) const { -} +void SettingsOverrideAPIPermission::Log(std::string* log) const {} } // namespace extensions diff --git a/chrome/common/extensions/permissions/settings_override_permission.h b/extensions/common/permissions/settings_override_permission.h index d123f83..48d3d71 100644 --- a/chrome/common/extensions/permissions/settings_override_permission.h +++ b/extensions/common/permissions/settings_override_permission.h @@ -1,9 +1,9 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 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_SETTINGS_OVERRIDE_PERMISSION_H_ -#define CHROME_COMMON_EXTENSIONS_PERMISSIONS_SETTINGS_OVERRIDE_PERMISSION_H_ +#ifndef EXTENSIONS_COMMON_PERMISSIONS_SETTINGS_OVERRIDE_PERMISSION_H_ +#define EXTENSIONS_COMMON_PERMISSIONS_SETTINGS_OVERRIDE_PERMISSION_H_ #include <string> @@ -15,8 +15,8 @@ namespace extensions { // override settings. class SettingsOverrideAPIPermission : public APIPermission { public: - SettingsOverrideAPIPermission( - const APIPermissionInfo* permission, const std::string& setting_value); + SettingsOverrideAPIPermission(const APIPermissionInfo* permission, + const std::string& setting_value); virtual ~SettingsOverrideAPIPermission(); // APIPermission overrides. @@ -41,4 +41,4 @@ class SettingsOverrideAPIPermission : public APIPermission { } // namespace extensions -#endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_SETTINGS_OVERRIDE_PERMISSION_H_ +#endif // EXTENSIONS_COMMON_PERMISSIONS_SETTINGS_OVERRIDE_PERMISSION_H_ diff --git a/chrome/common/extensions/permissions/socket_permission.cc b/extensions/common/permissions/socket_permission.cc index 6c08127..bc7d0c9 100644 --- a/chrome/common/extensions/permissions/socket_permission.cc +++ b/extensions/common/permissions/socket_permission.cc @@ -1,27 +1,25 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 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/socket_permission.h" +#include "extensions/common/permissions/socket_permission.h" #include <algorithm> #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/common/extensions/permissions/set_disjunction_permission.h" #include "extensions/common/permissions/permissions_info.h" +#include "extensions/common/permissions/set_disjunction_permission.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" namespace extensions { SocketPermission::SocketPermission(const APIPermissionInfo* info) - : SetDisjunctionPermission<SocketPermissionData, SocketPermission>(info) { -} + : SetDisjunctionPermission<SocketPermissionData, SocketPermission>(info) {} -SocketPermission::~SocketPermission() { -} +SocketPermission::~SocketPermission() {} PermissionMessages SocketPermission::GetMessages() const { DCHECK(HasMessages()); @@ -39,10 +37,10 @@ bool SocketPermission::AddAnyHostMessage(PermissionMessages& messages) const { for (i = data_set_.begin(); i != data_set_.end(); ++i) { if (i->entry().IsAddressBoundType() && i->entry().GetHostType() == SocketPermissionEntry::ANY_HOST) { - messages.push_back(PermissionMessage( - PermissionMessage::kSocketAnyHost, - l10n_util::GetStringUTF16( - IDS_EXTENSION_PROMPT_WARNING_SOCKET_ANY_HOST))); + messages.push_back( + PermissionMessage(PermissionMessage::kSocketAnyHost, + l10n_util::GetStringUTF16( + IDS_EXTENSION_PROMPT_WARNING_SOCKET_ANY_HOST))); return true; } } @@ -58,16 +56,16 @@ void SocketPermission::AddSubdomainHostMessage( domains.insert(base::UTF8ToUTF16(i->entry().pattern().host)); } if (!domains.empty()) { - int id = (domains.size() == 1) ? - IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN : - IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS; + int id = (domains.size() == 1) + ? IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAIN + : IDS_EXTENSION_PROMPT_WARNING_SOCKET_HOSTS_IN_DOMAINS; messages.push_back(PermissionMessage( PermissionMessage::kSocketDomainHosts, l10n_util::GetStringFUTF16( id, JoinString( - std::vector<base::string16>( - domains.begin(), domains.end()), ' ')))); + std::vector<base::string16>(domains.begin(), domains.end()), + ' ')))); } } @@ -80,16 +78,16 @@ void SocketPermission::AddSpecificHostMessage( hostnames.insert(base::UTF8ToUTF16(i->entry().pattern().host)); } if (!hostnames.empty()) { - int id = (hostnames.size() == 1) ? - IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST : - IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS; + int id = (hostnames.size() == 1) + ? IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOST + : IDS_EXTENSION_PROMPT_WARNING_SOCKET_SPECIFIC_HOSTS; messages.push_back(PermissionMessage( PermissionMessage::kSocketSpecificHosts, l10n_util::GetStringFUTF16( id, JoinString( - std::vector<base::string16>( - hostnames.begin(), hostnames.end()), ' ')))); + std::vector<base::string16>(hostnames.begin(), hostnames.end()), + ' ')))); } } @@ -99,10 +97,10 @@ void SocketPermission::AddNetworkListMessage( for (i = data_set_.begin(); i != data_set_.end(); ++i) { if (i->entry().pattern().type == content::SocketPermissionRequest::NETWORK_STATE) { - messages.push_back(PermissionMessage( - PermissionMessage::kNetworkState, - l10n_util::GetStringUTF16( - IDS_EXTENSION_PROMPT_WARNING_NETWORK_STATE))); + messages.push_back( + PermissionMessage(PermissionMessage::kNetworkState, + l10n_util::GetStringUTF16( + IDS_EXTENSION_PROMPT_WARNING_NETWORK_STATE))); } } } diff --git a/chrome/common/extensions/permissions/socket_permission.h b/extensions/common/permissions/socket_permission.h index 5f3373e..2bfea7c 100644 --- a/chrome/common/extensions/permissions/socket_permission.h +++ b/extensions/common/permissions/socket_permission.h @@ -1,26 +1,26 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 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_SOCKET_PERMISSION_H_ -#define CHROME_COMMON_EXTENSIONS_PERMISSIONS_SOCKET_PERMISSION_H_ +#ifndef EXTENSIONS_COMMON_PERMISSIONS_SOCKET_PERMISSION_H_ +#define EXTENSIONS_COMMON_PERMISSIONS_SOCKET_PERMISSION_H_ #include <string> -#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" +#include "extensions/common/permissions/set_disjunction_permission.h" +#include "extensions/common/permissions/socket_permission_data.h" namespace extensions { -class SocketPermission : public SetDisjunctionPermission<SocketPermissionData, - SocketPermission> { +class SocketPermission + : public SetDisjunctionPermission<SocketPermissionData, SocketPermission> { public: struct CheckParam : APIPermission::CheckParam { CheckParam(content::SocketPermissionRequest::OperationType type, - const std::string& host, - int port) - : request(type, host, port) { } + const std::string& host, + int port) + : request(type, host, port) {} content::SocketPermissionRequest request; }; @@ -40,4 +40,4 @@ class SocketPermission : public SetDisjunctionPermission<SocketPermissionData, } // namespace extensions -#endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_SOCKET_PERMISSION_H_ +#endif // EXTENSIONS_COMMON_PERMISSIONS_SOCKET_PERMISSION_H_ diff --git a/chrome/common/extensions/permissions/socket_permission_data.cc b/extensions/common/permissions/socket_permission_data.cc index b110cb50..b679268 100644 --- a/chrome/common/extensions/permissions/socket_permission_data.cc +++ b/extensions/common/permissions/socket_permission_data.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 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/socket_permission_data.h" +#include "extensions/common/permissions/socket_permission_data.h" #include <cstdlib> #include <sstream> @@ -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/socket_permission.h" #include "extensions/common/permissions/api_permission.h" +#include "extensions/common/permissions/socket_permission.h" #include "url/url_canon.h" namespace { @@ -80,9 +80,9 @@ const char* TypeToString(SocketPermissionRequest::OperationType type) { namespace extensions { -SocketPermissionData::SocketPermissionData() { } +SocketPermissionData::SocketPermissionData() {} -SocketPermissionData::~SocketPermissionData() { } +SocketPermissionData::~SocketPermissionData() {} bool SocketPermissionData::operator<(const SocketPermissionData& rhs) const { return entry_ < rhs.entry_; @@ -92,13 +92,12 @@ bool SocketPermissionData::operator==(const SocketPermissionData& rhs) const { return entry_ == rhs.entry_; } -bool SocketPermissionData::Check( - const APIPermission::CheckParam* param) const { +bool SocketPermissionData::Check(const APIPermission::CheckParam* param) const { if (!param) return false; const SocketPermission::CheckParam& specific_param = *static_cast<const SocketPermission::CheckParam*>(param); - const SocketPermissionRequest &request = specific_param.request; + const SocketPermissionRequest& request = specific_param.request; return entry_.Check(request); } @@ -116,8 +115,8 @@ bool SocketPermissionData::FromValue(const base::Value* value) { } SocketPermissionEntry& SocketPermissionData::entry() { - // Clear the spec because the caller could mutate |this|. - spec_.clear(); + // Clear the spec because the caller could mutate |this|. + spec_.clear(); return entry_; } diff --git a/chrome/common/extensions/permissions/socket_permission_data.h b/extensions/common/permissions/socket_permission_data.h index eaeb119..f227f8d 100644 --- a/chrome/common/extensions/permissions/socket_permission_data.h +++ b/extensions/common/permissions/socket_permission_data.h @@ -1,18 +1,20 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 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_SOCKET_PERMISSION_DATA_H_ -#define CHROME_COMMON_EXTENSIONS_PERMISSIONS_SOCKET_PERMISSION_DATA_H_ +#ifndef EXTENSIONS_COMMON_PERMISSIONS_SOCKET_PERMISSION_DATA_H_ +#define EXTENSIONS_COMMON_PERMISSIONS_SOCKET_PERMISSION_DATA_H_ #include <string> -#include "chrome/common/extensions/permissions/socket_permission_entry.h" #include "extensions/common/permissions/api_permission.h" +#include "extensions/common/permissions/socket_permission_entry.h" #include "ipc/ipc_param_traits.h" namespace ipc_fuzzer { -template <class T> struct FuzzTraits; -template <class T> struct GenerateTraits; +template <class T> +struct FuzzTraits; +template <class T> +struct GenerateTraits; } // namespace ipc_fuzzer namespace extensions { @@ -84,4 +86,4 @@ class SocketPermissionData { } // namespace extensions -#endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_SOCKET_PERMISSION_DATA_H_ +#endif // EXTENSIONS_COMMON_PERMISSIONS_SOCKET_PERMISSION_DATA_H_ diff --git a/chrome/common/extensions/permissions/socket_permission_entry.cc b/extensions/common/permissions/socket_permission_entry.cc index be426ea..8c21edc 100644 --- a/chrome/common/extensions/permissions/socket_permission_entry.cc +++ b/extensions/common/permissions/socket_permission_entry.cc @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 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/socket_permission_entry.h" +#include "extensions/common/permissions/socket_permission_entry.h" #include <cstdlib> #include <sstream> @@ -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/socket_permission.h" #include "extensions/common/permissions/api_permission.h" +#include "extensions/common/permissions/socket_permission.h" #include "url/url_canon.h" namespace { @@ -40,9 +40,8 @@ bool StartsOrEndsWithWhitespace(const std::string& str) { namespace extensions { SocketPermissionEntry::SocketPermissionEntry() - : pattern_(SocketPermissionRequest::NONE, std::string(), kInvalidPort), - match_subdomains_(false) { -} + : pattern_(SocketPermissionRequest::NONE, std::string(), kInvalidPort), + match_subdomains_(false) {} SocketPermissionEntry::~SocketPermissionEntry() {} @@ -89,8 +88,8 @@ bool SocketPermissionEntry::Check( url_parse::Component component(0, lhost.length()); url_canon::RawCanonOutputT<char, 128> ignored_output; url_canon::CanonHostInfo host_info; - url_canon::CanonicalizeIPAddress(lhost.c_str(), component, - &ignored_output, &host_info); + url_canon::CanonicalizeIPAddress( + lhost.c_str(), component, &ignored_output, &host_info); if (host_info.IsIPAddress()) return false; @@ -114,16 +113,17 @@ bool SocketPermissionEntry::Check( } SocketPermissionEntry::HostType SocketPermissionEntry::GetHostType() const { - return pattern_.host.empty() ? SocketPermissionEntry::ANY_HOST : - match_subdomains_ ? SocketPermissionEntry::HOSTS_IN_DOMAINS : - SocketPermissionEntry::SPECIFIC_HOSTS; + return pattern_.host.empty() + ? SocketPermissionEntry::ANY_HOST + : match_subdomains_ ? SocketPermissionEntry::HOSTS_IN_DOMAINS + : SocketPermissionEntry::SPECIFIC_HOSTS; } bool SocketPermissionEntry::IsAddressBoundType() const { return pattern_.type == SocketPermissionRequest::TCP_CONNECT || - pattern_.type == SocketPermissionRequest::TCP_LISTEN || - pattern_.type == SocketPermissionRequest::UDP_BIND || - pattern_.type == SocketPermissionRequest::UDP_SEND_TO; + pattern_.type == SocketPermissionRequest::TCP_LISTEN || + pattern_.type == SocketPermissionRequest::UDP_BIND || + pattern_.type == SocketPermissionRequest::UDP_SEND_TO; } // static @@ -159,10 +159,10 @@ bool SocketPermissionEntry::ParseHostPattern( return true; } - // Return an error if address is specified for permissions that don't - // need it (such as 'resolve-host'). - if (!result.IsAddressBoundType()) - return false; + // Return an error if address is specified for permissions that don't + // need it (such as 'resolve-host'). + if (!result.IsAddressBoundType()) + return false; result.pattern_.host = pattern_tokens[0]; if (!result.pattern_.host.empty()) { @@ -184,8 +184,7 @@ bool SocketPermissionEntry::ParseHostPattern( result.pattern_.host = JoinString(host_components, kDot); } - if (pattern_tokens.size() == 1 || - pattern_tokens[1].empty() || + if (pattern_tokens.size() == 1 || pattern_tokens[1].empty() || pattern_tokens[1] == kWildcard) { *entry = result; return true; @@ -213,7 +212,7 @@ std::string SocketPermissionEntry::GetHostPatternAsString() const { if (!pattern_.host.empty()) result.append(1, kDot).append(pattern_.host); } else { - result.append(pattern_.host); + result.append(pattern_.host); } if (pattern_.port == kWildcardPortNumber) diff --git a/chrome/common/extensions/permissions/socket_permission_entry.h b/extensions/common/permissions/socket_permission_entry.h index 5d2eb9b..ee4e212 100644 --- a/chrome/common/extensions/permissions/socket_permission_entry.h +++ b/extensions/common/permissions/socket_permission_entry.h @@ -1,8 +1,8 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright 2014 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_SOCKET_PERMISSION_ENTRY_H_ -#define CHROME_COMMON_EXTENSIONS_PERMISSIONS_SOCKET_PERMISSION_ENTRY_H_ +#ifndef EXTENSIONS_COMMON_PERMISSIONS_SOCKET_PERMISSION_ENTRY_H_ +#define EXTENSIONS_COMMON_PERMISSIONS_SOCKET_PERMISSION_ENTRY_H_ #include <string> #include <vector> @@ -11,8 +11,10 @@ #include "ipc/ipc_param_traits.h" namespace ipc_fuzzer { -template <class T> struct FuzzTraits; -template <class T> struct GenerateTraits; +template <class T> +struct FuzzTraits; +template <class T> +struct GenerateTraits; } // namespace ipc_fuzzer namespace extensions { @@ -21,11 +23,7 @@ namespace extensions { // as UDP "bind", host 127.0.0.1, port *. class SocketPermissionEntry { public: - enum HostType { - ANY_HOST, - HOSTS_IN_DOMAINS, - SPECIFIC_HOSTS, - }; + enum HostType { ANY_HOST, HOSTS_IN_DOMAINS, SPECIFIC_HOSTS, }; SocketPermissionEntry(); ~SocketPermissionEntry(); @@ -83,4 +81,4 @@ class SocketPermissionEntry { } // namespace extensions -#endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_SOCKET_PERMISSION_ENTRY_H_ +#endif // EXTENSIONS_COMMON_PERMISSIONS_SOCKET_PERMISSION_ENTRY_H_ diff --git a/chrome/common/extensions/permissions/usb_device_permission.cc b/extensions/common/permissions/usb_device_permission.cc index ee010ac..c381b89a 100644 --- a/chrome/common/extensions/permissions/usb_device_permission.cc +++ b/extensions/common/permissions/usb_device_permission.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 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/usb_device_permission.h" +#include "extensions/common/permissions/usb_device_permission.h" #include <set> #include <string> diff --git a/chrome/common/extensions/permissions/usb_device_permission.h b/extensions/common/permissions/usb_device_permission.h index 3e599f0..7f6b52a 100644 --- a/chrome/common/extensions/permissions/usb_device_permission.h +++ b/extensions/common/permissions/usb_device_permission.h @@ -1,14 +1,14 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 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_USB_DEVICE_PERMISSION_H_ -#define CHROME_COMMON_EXTENSIONS_PERMISSIONS_USB_DEVICE_PERMISSION_H_ +#ifndef EXTENSIONS_COMMON_PERMISSIONS_USB_DEVICE_PERMISSION_H_ +#define EXTENSIONS_COMMON_PERMISSIONS_USB_DEVICE_PERMISSION_H_ #include "base/basictypes.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" +#include "extensions/common/permissions/set_disjunction_permission.h" +#include "extensions/common/permissions/usb_device_permission_data.h" namespace extensions { @@ -35,4 +35,4 @@ class UsbDevicePermission } // namespace extensions -#endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_USB_DEVICE_PERMISSION_H_ +#endif // EXTENSIONS_COMMON_PERMISSIONS_USB_DEVICE_PERMISSION_H_ diff --git a/chrome/common/extensions/permissions/usb_device_permission_data.cc b/extensions/common/permissions/usb_device_permission_data.cc index 9cf32ba..532886d 100644 --- a/chrome/common/extensions/permissions/usb_device_permission_data.cc +++ b/extensions/common/permissions/usb_device_permission_data.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 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/usb_device_permission_data.h" +#include "extensions/common/permissions/usb_device_permission_data.h" #include <string> #include <vector> @@ -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/usb_device_permission.h" #include "extensions/common/permissions/api_permission.h" +#include "extensions/common/permissions/usb_device_permission.h" namespace { diff --git a/chrome/common/extensions/permissions/usb_device_permission_data.h b/extensions/common/permissions/usb_device_permission_data.h index c326371..001b12c 100644 --- a/chrome/common/extensions/permissions/usb_device_permission_data.h +++ b/extensions/common/permissions/usb_device_permission_data.h @@ -1,8 +1,8 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2014 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_USB_DEVICE_PERMISSION_DATA_H_ -#define CHROME_COMMON_EXTENSIONS_PERMISSIONS_USB_DEVICE_PERMISSION_DATA_H_ +#ifndef EXTENSIONS_COMMON_PERMISSIONS_USB_DEVICE_PERMISSION_DATA_H_ +#define EXTENSIONS_COMMON_PERMISSIONS_USB_DEVICE_PERMISSION_DATA_H_ #include <string> @@ -68,4 +68,4 @@ class UsbDevicePermissionData { } // namespace extensions -#endif // CHROME_COMMON_EXTENSIONS_PERMISSIONS_USB_DEVICE_PERMISSION_DATA_H_ +#endif // EXTENSIONS_COMMON_PERMISSIONS_USB_DEVICE_PERMISSION_DATA_H_ diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index f64f675..2da4dc4 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -28,6 +28,7 @@ '<(INTERMEDIATE_DIR)', ], 'sources': [ + 'common/api/messaging/message.h', 'common/common_manifest_handlers.cc', 'common/common_manifest_handlers.h', 'common/crx_file.cc', @@ -112,10 +113,16 @@ 'common/permissions/manifest_permission.h', 'common/permissions/manifest_permission_set.cc', 'common/permissions/manifest_permission_set.h', + 'common/permissions/media_galleries_permission.cc', + 'common/permissions/media_galleries_permission.h', + 'common/permissions/media_galleries_permission_data.cc', + 'common/permissions/media_galleries_permission_data.h', 'common/permissions/permission_message.cc', 'common/permissions/permission_message.h', 'common/permissions/permission_message_provider.cc', 'common/permissions/permission_message_provider.h', + 'common/permissions/permission_message_util.cc', + 'common/permissions/permission_message_util.h', 'common/permissions/permission_set.cc', 'common/permissions/permission_set.h', 'common/permissions/permissions_data.cc', @@ -123,6 +130,19 @@ 'common/permissions/permissions_info.cc', 'common/permissions/permissions_info.h', 'common/permissions/permissions_provider.h', + 'common/permissions/set_disjunction_permission.h', + 'common/permissions/settings_override_permission.cc', + 'common/permissions/settings_override_permission.h', + 'common/permissions/socket_permission.cc', + 'common/permissions/socket_permission.h', + 'common/permissions/socket_permission_data.cc', + 'common/permissions/socket_permission_data.h', + 'common/permissions/socket_permission_entry.cc', + 'common/permissions/socket_permission_entry.h', + 'common/permissions/usb_device_permission.cc', + 'common/permissions/usb_device_permission.h', + 'common/permissions/usb_device_permission_data.cc', + 'common/permissions/usb_device_permission_data.h', 'common/stack_frame.cc', 'common/stack_frame.h', 'common/switches.cc', |