From 08f7101e989e61098b4a33b2349f741d696ad01d Mon Sep 17 00:00:00 2001 From: "vasilii@chromium.org" Date: Fri, 25 Jul 2014 10:27:54 +0000 Subject: [PATCH] Componentize content_settings_types.h BUG=384861 TBR=jochen@chromium.org Review URL: https://codereview.chromium.org/410993002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285555 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/BUILD.gn | 1 + chrome/browser/DEPS | 1 + .../content_settings_details.h | 2 +- .../content_settings_mock_provider.h | 2 +- .../content_settings_observer.h | 2 +- ...nt_settings_origin_identifier_value_map.cc | 2 +- ...ent_settings_origin_identifier_value_map.h | 2 +- .../content_settings_provider.h | 2 +- .../content_settings_usages_state.h | 2 +- .../content_settings/content_settings_utils.h | 2 +- .../host_content_settings_map.h | 2 +- .../content_settings/mock_settings_observer.h | 2 +- .../permission_bubble_request_impl.h | 2 +- .../permission_context_base.h | 2 +- .../permission_context_base_unittest.cc | 2 +- .../permission_context_uma_util.h | 2 +- .../permission_infobar_delegate.h | 2 +- .../permission_queue_controller.h | 2 +- .../permission_queue_controller_unittest.cc | 2 +- .../tab_specific_content_settings.h | 2 +- .../content_settings_helpers.h | 1 + .../extension_special_storage_policy.cc | 2 +- ...tension_special_storage_policy_unittest.cc | 2 +- ...chrome_media_stream_infobar_browsertest.cc | 2 +- .../media/midi_permission_infobar_delegate.h | 2 +- .../desktop_notification_infobar_delegate.cc | 2 +- chrome/browser/profiles/profile_io_data.h | 2 +- .../gcm/push_messaging_infobar_delegate.h | 2 +- .../popup_blocked_infobar_delegate.cc | 2 +- chrome/browser/ui/browser.h | 2 +- chrome/browser/ui/browser_window.h | 2 +- chrome/browser/ui/chrome_pages.h | 2 +- .../content_setting_bubble_cocoa_unittest.mm | 2 +- .../location_bar/content_setting_decoration.h | 2 +- .../location_bar/location_bar_view_mac.h | 2 +- ...ontent_setting_bubble_model_browsertest.cc | 2 +- .../content_setting_bubble_model_delegate.h | 2 +- .../content_setting_image_model.h | 2 +- .../browser/ui/search/instant_controller.cc | 2 +- .../views/content_setting_bubble_contents.h | 2 +- .../location_bar/content_setting_image_view.h | 2 +- .../permission_selector_view.h | 2 +- .../website_settings_popup_view.cc | 2 +- .../website_settings/permission_menu_model.h | 2 +- .../permission_menu_model_unittest.cc | 2 +- .../ui/website_settings/website_settings.h | 2 +- .../ui/website_settings/website_settings_ui.h | 2 +- .../website_settings_unittest.cc | 2 +- .../webui/options/content_settings_handler.h | 2 +- chrome/chrome_browser.gypi | 1 + chrome/chrome_common.gypi | 2 +- chrome/common/BUILD.gn | 1 + chrome/common/DEPS | 1 + chrome/common/common_param_traits_macros.h | 1 + chrome/common/content_settings.h | 1 - chrome/common/render_messages.h | 1 + chrome/renderer/DEPS | 1 + chrome/renderer/content_settings_observer.h | 1 + components/components.gyp | 1 + components/content_settings.gypi | 20 +++++++++++++++++++ components/content_settings/OWNERS | 3 +++ .../content_settings/core/common/BUILD.gn | 9 +++++++++ .../core}/common/content_settings_types.h | 8 ++++---- 63 files changed, 94 insertions(+), 52 deletions(-) create mode 100644 components/content_settings.gypi create mode 100644 components/content_settings/OWNERS create mode 100644 components/content_settings/core/common/BUILD.gn rename {chrome => components/content_settings/core}/common/content_settings_types.h (83%) diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index 42c994b8d59c83..26762453eab321 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -46,6 +46,7 @@ static_library("browser") { "//components/autofill/core/browser", "//components/captive_portal", "//components/cloud_devices/common", + "//components/content_settings/core/common", "//components/data_reduction_proxy/browser", "//components/domain_reliability", "//components/favicon_base", diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 0aa06596a109e9..011ba1f8f8032b 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -19,6 +19,7 @@ include_rules = [ "+components/breakpad", "+components/cdm/browser", "+components/cloud_devices/common", + "+components/content_settings", "+components/data_reduction_proxy", "+components/dom_distiller", "+components/domain_reliability", diff --git a/chrome/browser/content_settings/content_settings_details.h b/chrome/browser/content_settings/content_settings_details.h index 2c6755a0cc7c55..523f9dedb140e7 100644 --- a/chrome/browser/content_settings/content_settings_details.h +++ b/chrome/browser/content_settings/content_settings_details.h @@ -9,8 +9,8 @@ #include "base/basictypes.h" #include "chrome/common/content_settings.h" -#include "chrome/common/content_settings_types.h" #include "chrome/common/content_settings_pattern.h" +#include "components/content_settings/core/common/content_settings_types.h" // Details for the CONTENT_SETTINGS_CHANGED notification. This is sent when // content settings change for at least one host. If settings change for more diff --git a/chrome/browser/content_settings/content_settings_mock_provider.h b/chrome/browser/content_settings/content_settings_mock_provider.h index 520066c5c7370b..abcc5e22128cb9 100644 --- a/chrome/browser/content_settings/content_settings_mock_provider.h +++ b/chrome/browser/content_settings/content_settings_mock_provider.h @@ -11,7 +11,7 @@ #include "chrome/browser/content_settings/content_settings_observable_provider.h" #include "chrome/browser/content_settings/content_settings_origin_identifier_value_map.h" #include "chrome/common/content_settings_pattern.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" namespace content_settings { diff --git a/chrome/browser/content_settings/content_settings_observer.h b/chrome/browser/content_settings/content_settings_observer.h index 01eb573029e2c2..232b1400c4a5e0 100644 --- a/chrome/browser/content_settings/content_settings_observer.h +++ b/chrome/browser/content_settings/content_settings_observer.h @@ -8,7 +8,7 @@ #include #include "chrome/common/content_settings_pattern.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" namespace content_settings { diff --git a/chrome/browser/content_settings/content_settings_origin_identifier_value_map.cc b/chrome/browser/content_settings/content_settings_origin_identifier_value_map.cc index 73b26a413dd02b..938fd8e8f6e654 100644 --- a/chrome/browser/content_settings/content_settings_origin_identifier_value_map.cc +++ b/chrome/browser/content_settings/content_settings_origin_identifier_value_map.cc @@ -11,7 +11,7 @@ #include "base/values.h" #include "chrome/browser/content_settings/content_settings_rule.h" #include "chrome/browser/content_settings/content_settings_utils.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "url/gurl.h" namespace content_settings { diff --git a/chrome/browser/content_settings/content_settings_origin_identifier_value_map.h b/chrome/browser/content_settings/content_settings_origin_identifier_value_map.h index 23833ad0e9e146..2e3d3cdb730796 100644 --- a/chrome/browser/content_settings/content_settings_origin_identifier_value_map.h +++ b/chrome/browser/content_settings/content_settings_origin_identifier_value_map.h @@ -10,7 +10,7 @@ #include "base/memory/linked_ptr.h" #include "chrome/common/content_settings_pattern.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" class GURL; diff --git a/chrome/browser/content_settings/content_settings_provider.h b/chrome/browser/content_settings/content_settings_provider.h index c75aca09444a6c..48e15ccb11b158 100644 --- a/chrome/browser/content_settings/content_settings_provider.h +++ b/chrome/browser/content_settings/content_settings_provider.h @@ -13,7 +13,7 @@ #include #include "base/values.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" class ContentSettingsPattern; diff --git a/chrome/browser/content_settings/content_settings_usages_state.h b/chrome/browser/content_settings/content_settings_usages_state.h index e137620183b5ea..01749d997fe18c 100644 --- a/chrome/browser/content_settings/content_settings_usages_state.h +++ b/chrome/browser/content_settings/content_settings_usages_state.h @@ -9,7 +9,7 @@ #include #include "chrome/common/content_settings.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "url/gurl.h" class Profile; diff --git a/chrome/browser/content_settings/content_settings_utils.h b/chrome/browser/content_settings/content_settings_utils.h index 97ee89a1617524..7a7a1de8dd9583 100644 --- a/chrome/browser/content_settings/content_settings_utils.h +++ b/chrome/browser/content_settings/content_settings_utils.h @@ -10,7 +10,7 @@ #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_pattern.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" namespace base { class Value; diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h index 148e325bb554f9..bde5461a411ff3 100644 --- a/chrome/browser/content_settings/host_content_settings_map.h +++ b/chrome/browser/content_settings/host_content_settings_map.h @@ -20,7 +20,7 @@ #include "chrome/browser/content_settings/content_settings_observer.h" #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_pattern.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" class ExtensionService; class GURL; diff --git a/chrome/browser/content_settings/mock_settings_observer.h b/chrome/browser/content_settings/mock_settings_observer.h index 56591cf4163ea2..4d2490d766202d 100644 --- a/chrome/browser/content_settings/mock_settings_observer.h +++ b/chrome/browser/content_settings/mock_settings_observer.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CONTENT_SETTINGS_MOCK_SETTINGS_OBSERVER_H_ #define CHROME_BROWSER_CONTENT_SETTINGS_MOCK_SETTINGS_OBSERVER_H_ -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/content_settings/permission_bubble_request_impl.h b/chrome/browser/content_settings/permission_bubble_request_impl.h index 89a9d601eae47d..660dcbf65c02e6 100644 --- a/chrome/browser/content_settings/permission_bubble_request_impl.h +++ b/chrome/browser/content_settings/permission_bubble_request_impl.h @@ -8,7 +8,7 @@ #include "base/callback.h" #include "chrome/browser/content_settings/permission_request_id.h" #include "chrome/browser/ui/website_settings/permission_bubble_request.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" class GURL; diff --git a/chrome/browser/content_settings/permission_context_base.h b/chrome/browser/content_settings/permission_context_base.h index 07af561dff7c91..e72912f00d44ea 100644 --- a/chrome/browser/content_settings/permission_context_base.h +++ b/chrome/browser/content_settings/permission_context_base.h @@ -10,7 +10,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/website_settings/permission_bubble_request.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "components/keyed_service/core/keyed_service.h" #include "url/gurl.h" diff --git a/chrome/browser/content_settings/permission_context_base_unittest.cc b/chrome/browser/content_settings/permission_context_base_unittest.cc index 1877081d05c543..22ce437a905dbc 100644 --- a/chrome/browser/content_settings/permission_context_base_unittest.cc +++ b/chrome/browser/content_settings/permission_context_base_unittest.cc @@ -10,9 +10,9 @@ #include "chrome/browser/content_settings/permission_request_id.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/common/content_settings.h" -#include "chrome/common/content_settings_types.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "content/public/browser/web_contents.h" #include "content/public/test/mock_render_process_host.h" #include "content/public/test/web_contents_tester.h" diff --git a/chrome/browser/content_settings/permission_context_uma_util.h b/chrome/browser/content_settings/permission_context_uma_util.h index 81deb5758e02a1..d364efb8f58a8d 100644 --- a/chrome/browser/content_settings/permission_context_uma_util.h +++ b/chrome/browser/content_settings/permission_context_uma_util.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_CONTEXT_UMA_UTIL_H_ #include "base/logging.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" // Provides a convenient way of logging UMA for permission related // operations. diff --git a/chrome/browser/content_settings/permission_infobar_delegate.h b/chrome/browser/content_settings/permission_infobar_delegate.h index ce838ce062b152..4ba26e74198326 100644 --- a/chrome/browser/content_settings/permission_infobar_delegate.h +++ b/chrome/browser/content_settings/permission_infobar_delegate.h @@ -7,7 +7,7 @@ #include "chrome/browser/content_settings/permission_request_id.h" #include "chrome/browser/infobars/infobar_service.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "components/infobars/core/confirm_infobar_delegate.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/content_settings/permission_queue_controller.h b/chrome/browser/content_settings/permission_queue_controller.h index 9fd62873d2a3cb..ba988218dfa13b 100644 --- a/chrome/browser/content_settings/permission_queue_controller.h +++ b/chrome/browser/content_settings/permission_queue_controller.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_QUEUE_CONTROLLER_H_ #include "base/bind.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/content_settings/permission_queue_controller_unittest.cc b/chrome/browser/content_settings/permission_queue_controller_unittest.cc index 7deac2c77f8c92..d1ca0e70d8c17e 100644 --- a/chrome/browser/content_settings/permission_queue_controller_unittest.cc +++ b/chrome/browser/content_settings/permission_queue_controller_unittest.cc @@ -8,9 +8,9 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/content_settings/permission_request_id.h" #include "chrome/browser/infobars/infobar_service.h" -#include "chrome/common/content_settings_types.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "content/public/browser/web_contents.h" #include "content/public/test/mock_render_process_host.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/content_settings/tab_specific_content_settings.h b/chrome/browser/content_settings/tab_specific_content_settings.h index 4375eb75d2edf6..baf04b3ebf3696 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings.h +++ b/chrome/browser/content_settings/tab_specific_content_settings.h @@ -15,8 +15,8 @@ #include "chrome/browser/content_settings/local_shared_objects_container.h" #include "chrome/browser/media/media_stream_devices_controller.h" #include "chrome/common/content_settings.h" -#include "chrome/common/content_settings_types.h" #include "chrome/common/custom_handlers/protocol_handler.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_observer.h" diff --git a/chrome/browser/extensions/api/content_settings/content_settings_helpers.h b/chrome/browser/extensions/api/content_settings/content_settings_helpers.h index 7b82f23dbdedc7..6c316f395563c2 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_helpers.h +++ b/chrome/browser/extensions/api/content_settings/content_settings_helpers.h @@ -9,6 +9,7 @@ #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_pattern.h" +#include "components/content_settings/core/common/content_settings_types.h" namespace extensions { namespace content_settings_helpers { diff --git a/chrome/browser/extensions/extension_special_storage_policy.cc b/chrome/browser/extensions/extension_special_storage_policy.cc index 57c91fb6e8b872..6503e58811a982 100644 --- a/chrome/browser/extensions/extension_special_storage_policy.cc +++ b/chrome/browser/extensions/extension_special_storage_policy.cc @@ -12,9 +12,9 @@ #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/content_settings.h" -#include "chrome/common/content_settings_types.h" #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" #include "chrome/common/url_constants.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/url_constants.h" #include "extensions/common/constants.h" diff --git a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc index 2eedcb0ca306df..fd70f73fb01e6c 100644 --- a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc +++ b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc @@ -7,8 +7,8 @@ #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/browser/extensions/extension_special_storage_policy.h" #include "chrome/common/content_settings.h" -#include "chrome/common/content_settings_types.h" #include "chrome/test/base/testing_profile.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "content/public/test/test_browser_thread.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" diff --git a/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc b/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc index 9a3913d82f1fa7..bddc113b4bb5d8 100644 --- a/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc +++ b/chrome/browser/media/chrome_media_stream_infobar_browsertest.cc @@ -17,10 +17,10 @@ #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/content_settings_types.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/test_switches.h" #include "chrome/test/base/ui_test_utils.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/notification_service.h" #include "content/public/common/media_stream_request.h" diff --git a/chrome/browser/media/midi_permission_infobar_delegate.h b/chrome/browser/media/midi_permission_infobar_delegate.h index 02da9412041797..fb6ef5dddd4a04 100644 --- a/chrome/browser/media/midi_permission_infobar_delegate.h +++ b/chrome/browser/media/midi_permission_infobar_delegate.h @@ -7,7 +7,7 @@ #include #include "chrome/browser/content_settings/permission_infobar_delegate.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" class GURL; class PermissionQueueController; diff --git a/chrome/browser/notifications/desktop_notification_infobar_delegate.cc b/chrome/browser/notifications/desktop_notification_infobar_delegate.cc index 246ae15b1c9b6b..b00a5c320af86b 100644 --- a/chrome/browser/notifications/desktop_notification_infobar_delegate.cc +++ b/chrome/browser/notifications/desktop_notification_infobar_delegate.cc @@ -7,7 +7,7 @@ #include "chrome/browser/content_settings/permission_queue_controller.h" #include "chrome/browser/content_settings/permission_request_id.h" #include "chrome/browser/infobars/infobar_service.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h index ef05f141849a31..8d0a4cd40b1626 100644 --- a/chrome/browser/profiles/profile_io_data.h +++ b/chrome/browser/profiles/profile_io_data.h @@ -21,7 +21,7 @@ #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/storage_partition_descriptor.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "components/data_reduction_proxy/browser/data_reduction_proxy_usage_stats.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/resource_context.h" diff --git a/chrome/browser/services/gcm/push_messaging_infobar_delegate.h b/chrome/browser/services/gcm/push_messaging_infobar_delegate.h index 107a31d4b9a7b7..0fcb547310d628 100644 --- a/chrome/browser/services/gcm/push_messaging_infobar_delegate.h +++ b/chrome/browser/services/gcm/push_messaging_infobar_delegate.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_SERVICES_GCM_PUSH_MESSAGING_INFOBAR_DELEGATE_H_ #include "chrome/browser/content_settings/permission_infobar_delegate.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" class GURL; class InfoBarService; diff --git a/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc b/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc index 2bc88c925088a7..eaa0103fcada52 100644 --- a/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc +++ b/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.cc @@ -10,7 +10,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" #include "chrome/common/content_settings.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "components/infobars/core/infobar.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h index a6492ef9e097f0..b522363d37fd9a 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -32,7 +32,7 @@ #include "chrome/browser/ui/toolbar/toolbar_model.h" #include "chrome/browser/ui/zoom/zoom_observer.h" #include "chrome/common/content_settings.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/page_navigator.h" diff --git a/chrome/browser/ui/browser_window.h b/chrome/browser/ui/browser_window.h index 03e319122f52b2..23fe45f2bf4fe0 100644 --- a/chrome/browser/ui/browser_window.h +++ b/chrome/browser/ui/browser_window.h @@ -14,7 +14,7 @@ #include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/sync/one_click_signin_sync_starter.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "components/translate/core/common/translate_errors.h" #include "ui/base/base_window.h" #include "ui/base/window_open_disposition.h" diff --git a/chrome/browser/ui/chrome_pages.h b/chrome/browser/ui/chrome_pages.h index 0705e46f5db97f..5aa7f1a269cc5a 100644 --- a/chrome/browser/ui/chrome_pages.h +++ b/chrome/browser/ui/chrome_pages.h @@ -9,7 +9,7 @@ #include "chrome/browser/signin/signin_promo.h" #include "chrome/browser/ui/host_desktop.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "url/gurl.h" class Browser; diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm index c33bc1148c4536..6d06b7f1676404 100644 --- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm @@ -13,11 +13,11 @@ #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" #include "chrome/common/chrome_content_client.h" -#include "chrome/common/content_settings_types.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/chrome_unit_test_suite.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "content/public/common/media_stream_request.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h index f5594cd28c7026..9873e3139fa29b 100644 --- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/location_bar/image_decoration.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" // ContentSettingDecoration is used to display the content settings // images on the current page. diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h index 22347388129adc..45cc29b1af752b 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h @@ -18,7 +18,7 @@ #include "chrome/browser/ui/location_bar/location_bar.h" #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" #include "chrome/browser/ui/search/search_model_observer.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" @class AutocompleteTextField; class CommandUpdater; diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc index aaf96f2ab690c2..dfe2b761c654d2 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc @@ -10,9 +10,9 @@ #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" -#include "chrome/common/content_settings_types.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "content/public/test/test_navigation_observer.h" #include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_delegate.h b/chrome/browser/ui/content_settings/content_setting_bubble_model_delegate.h index 1b1709bfcfe9f9..058e8ad9687689 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model_delegate.h +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_delegate.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_DELEGATE_H_ #define CHROME_BROWSER_UI_CONTENT_SETTINGS_CONTENT_SETTING_BUBBLE_MODEL_DELEGATE_H_ -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" namespace content { class WebContents; diff --git a/chrome/browser/ui/content_settings/content_setting_image_model.h b/chrome/browser/ui/content_settings/content_setting_image_model.h index 0b8da62c565664..b1c04af788b8a9 100644 --- a/chrome/browser/ui/content_settings/content_setting_image_model.h +++ b/chrome/browser/ui/content_settings/content_setting_image_model.h @@ -8,7 +8,7 @@ #include #include "base/basictypes.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" namespace content { class WebContents; diff --git a/chrome/browser/ui/search/instant_controller.cc b/chrome/browser/ui/search/instant_controller.cc index 1a2ccd5ce80543..0021a5f7e5a728 100644 --- a/chrome/browser/ui/search/instant_controller.cc +++ b/chrome/browser/ui/search/instant_controller.cc @@ -19,10 +19,10 @@ #include "chrome/browser/ui/search/instant_tab.h" #include "chrome/browser/ui/search/search_tab_helper.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/content_settings_types.h" #include "chrome/common/pref_names.h" #include "chrome/common/search_urls.h" #include "chrome/common/url_constants.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "components/search_engines/template_url_service.h" #include "components/sessions/serialized_navigation_entry.h" #include "content/public/browser/navigation_entry.h" diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.h b/chrome/browser/ui/views/content_setting_bubble_contents.h index 94ed3179797065..b8ba2aa51a6b9c 100644 --- a/chrome/browser/ui/views/content_setting_bubble_contents.h +++ b/chrome/browser/ui/views/content_setting_bubble_contents.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/common/media_stream_request.h" #include "ui/views/bubble/bubble_delegate.h" diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.h b/chrome/browser/ui/views/location_bar/content_setting_image_view.h index 4bd97ee018f4f9..f215960dfd4acd 100644 --- a/chrome/browser/ui/views/location_bar/content_setting_image_view.h +++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_ #include "base/memory/scoped_ptr.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/animation/slide_animation.h" #include "ui/views/painter.h" diff --git a/chrome/browser/ui/views/website_settings/permission_selector_view.h b/chrome/browser/ui/views/website_settings/permission_selector_view.h index d963307a5c055c..9ae199957a92bb 100644 --- a/chrome/browser/ui/views/website_settings/permission_selector_view.h +++ b/chrome/browser/ui/views/website_settings/permission_selector_view.h @@ -14,7 +14,7 @@ #include "chrome/browser/ui/website_settings/permission_menu_model.h" #include "chrome/browser/ui/website_settings/website_settings_ui.h" #include "chrome/common/content_settings.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "ui/views/controls/button/menu_button_listener.h" #include "ui/views/view.h" diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc index ec91143d761d5f..3d2a10dada4d44 100644 --- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc +++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc @@ -17,8 +17,8 @@ #include "chrome/browser/ui/views/website_settings/permission_selector_view.h" #include "chrome/browser/ui/website_settings/website_settings.h" #include "chrome/browser/ui/website_settings/website_settings_utils.h" -#include "chrome/common/content_settings_types.h" #include "chrome/common/url_constants.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/cert_store.h" #include "content/public/browser/user_metrics.h" diff --git a/chrome/browser/ui/website_settings/permission_menu_model.h b/chrome/browser/ui/website_settings/permission_menu_model.h index 0754f7131c018a..9f9a30822f3ef4 100644 --- a/chrome/browser/ui/website_settings/permission_menu_model.h +++ b/chrome/browser/ui/website_settings/permission_menu_model.h @@ -7,7 +7,7 @@ #include "chrome/browser/ui/website_settings/website_settings_ui.h" #include "chrome/common/content_settings.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "ui/base/models/simple_menu_model.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/website_settings/permission_menu_model_unittest.cc b/chrome/browser/ui/website_settings/permission_menu_model_unittest.cc index 64c68737ed11a9..cc2860f3e50f7c 100644 --- a/chrome/browser/ui/website_settings/permission_menu_model_unittest.cc +++ b/chrome/browser/ui/website_settings/permission_menu_model_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/ui/website_settings/permission_menu_model.h" #include "chrome/common/content_settings.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/website_settings/website_settings.h b/chrome/browser/ui/website_settings/website_settings.h index c310116c3c606d..2d9c2ce95c5fe6 100644 --- a/chrome/browser/ui/website_settings/website_settings.h +++ b/chrome/browser/ui/website_settings/website_settings.h @@ -13,7 +13,7 @@ #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/history/history_service.h" #include "chrome/common/content_settings.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "content/public/common/signed_certificate_timestamp_id_and_status.h" #include "ui/gfx/native_widget_types.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/website_settings/website_settings_ui.h b/chrome/browser/ui/website_settings/website_settings_ui.h index b9e075c4e92568..e12485132e3df8 100644 --- a/chrome/browser/ui/website_settings/website_settings_ui.h +++ b/chrome/browser/ui/website_settings/website_settings_ui.h @@ -11,7 +11,7 @@ #include "base/strings/string16.h" #include "chrome/browser/ui/website_settings/website_settings.h" #include "chrome/common/content_settings.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "content/public/common/signed_certificate_timestamp_id_and_status.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/ui/website_settings/website_settings_unittest.cc b/chrome/browser/ui/website_settings/website_settings_unittest.cc index 45877f63bd6cd9..aabd9eedf1c085 100644 --- a/chrome/browser/ui/website_settings/website_settings_unittest.cc +++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc @@ -15,9 +15,9 @@ #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/ui/website_settings/website_settings_ui.h" #include "chrome/common/content_settings.h" -#include "chrome/common/content_settings_types.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/cert_store.h" #include "content/public/common/ssl_status.h" diff --git a/chrome/browser/ui/webui/options/content_settings_handler.h b/chrome/browser/ui/webui/options/content_settings_handler.h index 892c46d1e3f385..023a5abf64a06b 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.h +++ b/chrome/browser/ui/webui/options/content_settings_handler.h @@ -13,7 +13,7 @@ #include "chrome/browser/ui/webui/options/options_ui.h" #include "chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h" #include "chrome/common/content_settings.h" -#include "chrome/common/content_settings_types.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "content/public/browser/host_zoom_map.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 8e84075fa34b0b..5a5856493841e4 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2865,6 +2865,7 @@ '../components/components.gyp:captive_portal', '../components/components.gyp:cloud_devices_common', '../components/components.gyp:component_metrics_proto', + '../components/components.gyp:content_settings_core_common', '../components/components.gyp:data_reduction_proxy_browser', '../components/components.gyp:domain_reliability', '../components/components.gyp:favicon_base', diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index d24c2486391005..ec20b0d19de68f 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -54,7 +54,6 @@ 'common/content_settings_pattern.h', 'common/content_settings_pattern_parser.cc', 'common/content_settings_pattern_parser.h', - 'common/content_settings_types.h', 'common/crash_keys.cc', 'common/crash_keys.h', 'common/custom_handlers/protocol_handler.cc', @@ -321,6 +320,7 @@ '<(DEPTH)/chrome/common_constants.gyp:common_constants', '<(DEPTH)/components/components.gyp:cloud_devices_common', '<(DEPTH)/components/components.gyp:component_updater', + '<(DEPTH)/components/components.gyp:content_settings_core_common', '<(DEPTH)/components/components.gyp:json_schema', '<(DEPTH)/components/components.gyp:metrics', '<(DEPTH)/components/components.gyp:policy_component_common', diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn index 35496057c9903b..4930360dd69c78 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn @@ -50,6 +50,7 @@ static_library("common") { "//chrome/common/net", "//chrome/common/safe_browsing:proto", "//components/cloud_devices/common", + "//components/content_settings/core/common", "//components/json_schema", "//components/metrics", "//components/policy:policy_component_common", diff --git a/chrome/common/DEPS b/chrome/common/DEPS index 7f28bda0394396..9308a7db48ed5c 100644 --- a/chrome/common/DEPS +++ b/chrome/common/DEPS @@ -6,6 +6,7 @@ include_rules = [ "+components/autofill/core/common", "+components/bookmarks/common", "+components/cloud_devices/common", + "+components/content_settings/core/common", "+components/data_reduction_proxy/common", "+components/metrics/client_info.h", "+components/metrics/metrics_pref_names.h", diff --git a/chrome/common/common_param_traits_macros.h b/chrome/common/common_param_traits_macros.h index 7db07f329fcd5b..b4a00599a377d6 100644 --- a/chrome/common/common_param_traits_macros.h +++ b/chrome/common/common_param_traits_macros.h @@ -9,6 +9,7 @@ #define CHROME_COMMON_COMMON_PARAM_TRAITS_MACROS_H_ #include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "ipc/ipc_message_macros.h" IPC_ENUM_TRAITS_MAX_VALUE(ContentSetting, CONTENT_SETTING_NUM_SETTINGS - 1) diff --git a/chrome/common/content_settings.h b/chrome/common/content_settings.h index bf92413bc10e9d..bcfbebc099563b 100644 --- a/chrome/common/content_settings.h +++ b/chrome/common/content_settings.h @@ -9,7 +9,6 @@ #include #include "chrome/common/content_settings_pattern.h" -#include "chrome/common/content_settings_types.h" // Different settings that can be assigned for a particular content type. We // give the user the ability to set these on a global and per-origin basis. diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h index eb4caab4a829c6..d4a209c9706544 100644 --- a/chrome/common/render_messages.h +++ b/chrome/common/render_messages.h @@ -23,6 +23,7 @@ #include "chrome/common/ntp_logging_events.h" #include "chrome/common/omnibox_focus_state.h" #include "chrome/common/search_provider.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "components/nacl/common/nacl_types.h" #include "content/public/common/common_param_traits.h" #include "content/public/common/referrer.h" diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS index 9b44a64d432ecd..4d0cb15f6ef639 100644 --- a/chrome/renderer/DEPS +++ b/chrome/renderer/DEPS @@ -4,6 +4,7 @@ include_rules = [ "+components/autofill/content/renderer", "+components/autofill/core/common", "+components/cdm/renderer", + "+components/content_settings/core/common", "+components/data_reduction_proxy/common", "+components/nacl/renderer", "+components/plugins/renderer", diff --git a/chrome/renderer/content_settings_observer.h b/chrome/renderer/content_settings_observer.h index 8a02bedddaa40c..ba7296116ecede 100644 --- a/chrome/renderer/content_settings_observer.h +++ b/chrome/renderer/content_settings_observer.h @@ -9,6 +9,7 @@ #include #include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings_types.h" #include "content/public/renderer/render_frame_observer.h" #include "content/public/renderer/render_frame_observer_tracker.h" #include "extensions/common/permissions/api_permission.h" diff --git a/components/components.gyp b/components/components.gyp index 6d45444855c239..6def0a0aae2dff 100644 --- a/components/components.gyp +++ b/components/components.gyp @@ -18,6 +18,7 @@ 'captive_portal.gypi', 'cloud_devices.gypi', 'component_updater.gypi', + 'content_settings.gypi', 'cronet.gypi', 'data_reduction_proxy.gypi', 'dom_distiller.gypi', diff --git a/components/content_settings.gypi b/components/content_settings.gypi new file mode 100644 index 00000000000000..478aa866f1a179 --- /dev/null +++ b/components/content_settings.gypi @@ -0,0 +1,20 @@ +# 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. + +{ + 'targets': [ + { + # GN version: //components/content_settings/core/common + 'target_name': 'content_settings_core_common', + 'type': 'none', + 'include_dirs': [ + '..', + ], + 'sources': [ + # Note: sources list duplicated in GN build. + 'content_settings/core/common/content_settings_types.h', + ], + }, + ], +} diff --git a/components/content_settings/OWNERS b/components/content_settings/OWNERS new file mode 100644 index 00000000000000..d7b85ac0a44ece --- /dev/null +++ b/components/content_settings/OWNERS @@ -0,0 +1,3 @@ +bauerb@chromium.org +jochen@chromium.org +markusheintz@chromium.org diff --git a/components/content_settings/core/common/BUILD.gn b/components/content_settings/core/common/BUILD.gn new file mode 100644 index 00000000000000..7c7d0a1e7e0af0 --- /dev/null +++ b/components/content_settings/core/common/BUILD.gn @@ -0,0 +1,9 @@ +# 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. + +source_set("common") { + sources = [ + "content_settings_types.h", + ] +} diff --git a/chrome/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h similarity index 83% rename from chrome/common/content_settings_types.h rename to components/content_settings/core/common/content_settings_types.h index a99c7e3cdae269..b281f9a5d7ca8d 100644 --- a/chrome/common/content_settings_types.h +++ b/components/content_settings/core/common/content_settings_types.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_CONTENT_SETTINGS_TYPES_H_ -#define CHROME_COMMON_CONTENT_SETTINGS_TYPES_H_ +#ifndef COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_ +#define COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_ // A particular type of content to care about. We give the user various types // of controls over each of these. @@ -41,4 +41,4 @@ enum ContentSettingsType { CONTENT_SETTINGS_NUM_TYPES, }; -#endif // CHROME_COMMON_CONTENT_SETTINGS_TYPES_H_ +#endif // COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_CONTENT_SETTINGS_TYPES_H_