diff options
Diffstat (limited to 'chrome/browser/content_settings')
12 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/content_settings/content_settings_default_provider.cc b/chrome/browser/content_settings/content_settings_default_provider.cc index 517be45..641c3b7 100644 --- a/chrome/browser/content_settings/content_settings_default_provider.cc +++ b/chrome/browser/content_settings/content_settings_default_provider.cc @@ -16,8 +16,8 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/content_settings/content_settings_rule.h" #include "chrome/browser/content_settings/content_settings_utils.h" -#include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/content_settings/content_settings_details.h b/chrome/browser/content_settings/content_settings_details.h index f47ea30..9677560 100644 --- a/chrome/browser/content_settings/content_settings_details.h +++ b/chrome/browser/content_settings/content_settings_details.h @@ -8,7 +8,7 @@ #include <string> #include "base/basictypes.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/content_settings_types.h" diff --git a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc index 4a3888a..57da3d9 100644 --- a/chrome/browser/content_settings/content_settings_internal_extension_provider.cc +++ b/chrome/browser/content_settings/content_settings_internal_extension_provider.cc @@ -7,8 +7,8 @@ #include "chrome/browser/content_settings/content_settings_rule.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/common/chrome_content_client.h" -#include "chrome/common/content_settings.h" #include "chrome/common/extensions/api/plugins/plugins_handler.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/content_settings/content_settings_internal_extension_provider.h b/chrome/browser/content_settings/content_settings_internal_extension_provider.h index cb97bd6..2078f4e 100644 --- a/chrome/browser/content_settings/content_settings_internal_extension_provider.h +++ b/chrome/browser/content_settings/content_settings_internal_extension_provider.h @@ -9,7 +9,7 @@ #include "base/synchronization/lock.h" #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.h" +#include "components/content_settings/core/common/content_settings.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc index e880ae6..0046dd3 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider.cc @@ -20,8 +20,8 @@ #include "chrome/browser/content_settings/content_settings_utils.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/content_settings/content_settings_usages_state.h b/chrome/browser/content_settings/content_settings_usages_state.h index 01749d9..ff72167 100644 --- a/chrome/browser/content_settings/content_settings_usages_state.h +++ b/chrome/browser/content_settings/content_settings_usages_state.h @@ -8,7 +8,7 @@ #include <map> #include <set> -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "url/gurl.h" diff --git a/chrome/browser/content_settings/content_settings_utils.h b/chrome/browser/content_settings/content_settings_utils.h index af7c3c5..3f62cf6 100644 --- a/chrome/browser/content_settings/content_settings_utils.h +++ b/chrome/browser/content_settings/content_settings_utils.h @@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/content_settings_types.h" diff --git a/chrome/browser/content_settings/cookie_settings.h b/chrome/browser/content_settings/cookie_settings.h index 44902e6..ed8edba 100644 --- a/chrome/browser/content_settings/cookie_settings.h +++ b/chrome/browser/content_settings/cookie_settings.h @@ -13,7 +13,7 @@ #include "base/prefs/pref_change_registrar.h" #include "base/synchronization/lock.h" #include "chrome/browser/content_settings/host_content_settings_map.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/keyed_service/content/refcounted_browser_context_keyed_service.h" #include "components/keyed_service/content/refcounted_browser_context_keyed_service_factory.h" diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h index b5939b5..1b05880 100644 --- a/chrome/browser/content_settings/host_content_settings_map.h +++ b/chrome/browser/content_settings/host_content_settings_map.h @@ -19,7 +19,7 @@ #include "base/threading/platform_thread.h" #include "base/tuple.h" #include "chrome/browser/content_settings/content_settings_observer.h" -#include "chrome/common/content_settings.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/content_settings_types.h" diff --git a/chrome/browser/content_settings/permission_context_base_unittest.cc b/chrome/browser/content_settings/permission_context_base_unittest.cc index 22ce437..29fd316a 100644 --- a/chrome/browser/content_settings/permission_context_base_unittest.cc +++ b/chrome/browser/content_settings/permission_context_base_unittest.cc @@ -9,9 +9,9 @@ #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.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.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" diff --git a/chrome/browser/content_settings/permission_queue_controller.cc b/chrome/browser/content_settings/permission_queue_controller.cc index c32e9d9..191e085 100644 --- a/chrome/browser/content_settings/permission_queue_controller.cc +++ b/chrome/browser/content_settings/permission_queue_controller.cc @@ -15,8 +15,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/services/gcm/push_messaging_infobar_delegate.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "chrome/common/content_settings.h" #include "chrome/common/pref_names.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/content_settings/tab_specific_content_settings.h b/chrome/browser/content_settings/tab_specific_content_settings.h index 8a338ce..b3b8d2d 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings.h +++ b/chrome/browser/content_settings/tab_specific_content_settings.h @@ -16,8 +16,8 @@ #include "chrome/browser/content_settings/content_settings_usages_state.h" #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/custom_handlers/protocol_handler.h" +#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" |