diff options
107 files changed, 185 insertions, 181 deletions
diff --git a/apps/app_load_service.cc b/apps/app_load_service.cc index 496b4da..071f95e 100644 --- a/apps/app_load_service.cc +++ b/apps/app_load_service.cc @@ -9,7 +9,6 @@ #include "apps/shell_window_registry.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/unpacked_installer.h" @@ -17,6 +16,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" using extensions::Extension; diff --git a/apps/app_load_service_factory.cc b/apps/app_load_service_factory.cc index a296d34..6c3b459 100644 --- a/apps/app_load_service_factory.cc +++ b/apps/app_load_service_factory.cc @@ -6,10 +6,10 @@ #include "apps/app_load_service.h" #include "apps/shell_window_registry.h" -#include "chrome/browser/extensions/extension_prefs_factory.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/profiles/profile.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "extensions/browser/extension_prefs_factory.h" #include "extensions/browser/extensions_browser_client.h" namespace apps { diff --git a/apps/app_restore_service.cc b/apps/app_restore_service.cc index 75cf195..4ea76ee 100644 --- a/apps/app_restore_service.cc +++ b/apps/app_restore_service.cc @@ -12,10 +12,10 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/app_runtime/app_runtime_api.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" diff --git a/apps/app_restore_service_browsertest.cc b/apps/app_restore_service_browsertest.cc index 67c007f..833cee5 100644 --- a/apps/app_restore_service_browsertest.cc +++ b/apps/app_restore_service_browsertest.cc @@ -8,11 +8,11 @@ #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/file_system/file_system_api.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" using extensions::Extension; diff --git a/apps/launcher.cc b/apps/launcher.cc index 6b077dd..815a00b 100644 --- a/apps/launcher.cc +++ b/apps/launcher.cc @@ -16,7 +16,6 @@ #include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h" #include "chrome/browser/extensions/api/file_system/file_system_api.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" @@ -26,6 +25,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/browser/lazy_background_task_queue.h" #include "extensions/browser/process_manager.h" #include "extensions/common/extension.h" diff --git a/apps/saved_files_service.cc b/apps/saved_files_service.cc index bc85ac4..b823964 100644 --- a/apps/saved_files_service.cc +++ b/apps/saved_files_service.cc @@ -12,11 +12,11 @@ #include "base/value_conversions.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/notification_service.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/permission_set.h" diff --git a/apps/saved_files_service_unittest.cc b/apps/saved_files_service_unittest.cc index 7a467ae..a4cf77c 100644 --- a/apps/saved_files_service_unittest.cc +++ b/apps/saved_files_service_unittest.cc @@ -9,11 +9,11 @@ #include "base/strings/string_number_conversions.h" #include "base/test/values_test_util.h" #include "base/values.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/test_extension_environment.h" #include "chrome/test/base/testing_profile.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/apps/shell/shell_extension_system.cc b/apps/shell/shell_extension_system.cc index dfb9fec..ecf2b8e 100644 --- a/apps/shell/shell_extension_system.cc +++ b/apps/shell/shell_extension_system.cc @@ -9,7 +9,6 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/common/extensions/extension_file_util.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" @@ -17,6 +16,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/info_map.h" #include "extensions/browser/lazy_background_task_queue.h" diff --git a/apps/shell/shell_extensions_browser_client.cc b/apps/shell/shell_extensions_browser_client.cc index f745200..810379e 100644 --- a/apps/shell/shell_extensions_browser_client.cc +++ b/apps/shell/shell_extensions_browser_client.cc @@ -9,11 +9,11 @@ #include "base/prefs/pref_service.h" #include "base/prefs/pref_service_factory.h" #include "base/prefs/testing_pref_store.h" -#include "chrome/browser/extensions/extension_prefs.h" -#include "chrome/browser/extensions/extension_prefs_factory.h" #include "components/user_prefs/pref_registry_syncable.h" #include "components/user_prefs/user_prefs.h" #include "extensions/browser/app_sorting.h" +#include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_prefs_factory.h" using content::BrowserContext; diff --git a/apps/shell_window_geometry_cache.cc b/apps/shell_window_geometry_cache.cc index 9d1dcb4..8be592f 100644 --- a/apps/shell_window_geometry_cache.cc +++ b/apps/shell_window_geometry_cache.cc @@ -8,13 +8,13 @@ #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_prefs.h" -#include "chrome/browser/extensions/extension_prefs_factory.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_prefs_factory.h" #include "extensions/common/extension.h" namespace { diff --git a/apps/shell_window_geometry_cache_unittest.cc b/apps/shell_window_geometry_cache_unittest.cc index a4ecdc5..2b6d15c 100644 --- a/apps/shell_window_geometry_cache_unittest.cc +++ b/apps/shell_window_geometry_cache_unittest.cc @@ -6,11 +6,11 @@ #include "base/memory/scoped_ptr.h" #include "base/prefs/mock_pref_change_callback.h" #include "base/strings/string_number_conversions.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/test_extension_prefs.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/extension_prefs.h" #include "testing/gtest/include/gtest/gtest.h" const char kWindowId[] = "windowid"; diff --git a/chrome/browser/apps/ephemeral_app_service.cc b/chrome/browser/apps/ephemeral_app_service.cc index 612b214..1b4713b 100644 --- a/chrome/browser/apps/ephemeral_app_service.cc +++ b/chrome/browser/apps/ephemeral_app_service.cc @@ -7,7 +7,6 @@ #include "base/command_line.h" #include "chrome/browser/apps/ephemeral_app_service_factory.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" @@ -16,6 +15,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" diff --git a/chrome/browser/apps/ephemeral_app_service_browsertest.cc b/chrome/browser/apps/ephemeral_app_service_browsertest.cc index bd9d199e..24f7f15 100644 --- a/chrome/browser/apps/ephemeral_app_service_browsertest.cc +++ b/chrome/browser/apps/ephemeral_app_service_browsertest.cc @@ -6,11 +6,11 @@ #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/apps/ephemeral_app_service.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/manifest.h" using extensions::PlatformAppBrowserTest; diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc index a85c437..9a5a858 100644 --- a/chrome/browser/background/background_application_list_model.cc +++ b/chrome/browser/background/background_application_list_model.cc @@ -17,7 +17,6 @@ #include "chrome/browser/background/background_mode_manager.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/image_loader.h" @@ -27,6 +26,7 @@ #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" #include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" diff --git a/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc b/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc index 449264f..f893777 100644 --- a/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc +++ b/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc @@ -11,13 +11,13 @@ #include "base/time/time.h" #include "base/values.h" #include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/app_runtime.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/api/declarative/declarative_apitest.cc b/chrome/browser/extensions/api/declarative/declarative_apitest.cc index 0949d1e..9c8d8d2 100644 --- a/chrome/browser/extensions/api/declarative/declarative_apitest.cc +++ b/chrome/browser/extensions/api/declarative/declarative_apitest.cc @@ -13,7 +13,6 @@ #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h" #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/test_extension_dir.h" @@ -22,6 +21,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/api/declarative/rules_registry.cc b/chrome/browser/extensions/api/declarative/rules_registry.cc index d5b5de5..897f85a 100644 --- a/chrome/browser/extensions/api/declarative/rules_registry.cc +++ b/chrome/browser/extensions/api/declarative/rules_registry.cc @@ -16,7 +16,6 @@ #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/declarative/rules_cache_delegate.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" @@ -25,6 +24,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" namespace { diff --git a/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc b/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc index 1b1f569..25a191e 100644 --- a/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc +++ b/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc @@ -12,7 +12,6 @@ #include "base/run_loop.h" #include "chrome/browser/extensions/api/declarative/rules_cache_delegate.h" #include "chrome/browser/extensions/api/declarative/test_rules_registry.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/test_extension_environment.h" #include "chrome/browser/extensions/test_extension_system.h" @@ -20,6 +19,8 @@ #include "chrome/common/extensions/extension_test_util.h" #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/test/base/testing_profile.h" +#include "content/public/test/test_browser_thread_bundle.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc index f8d446f..5cb5d3a 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc @@ -39,7 +39,6 @@ #include "chrome/browser/download/download_stats.h" #include "chrome/browser/download/drag_download_item.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_warning_service.h" @@ -70,6 +69,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permissions_data.h" #include "net/base/load_flags.h" diff --git a/chrome/browser/extensions/api/extension_action/extension_action_prefs_unittest.cc b/chrome/browser/extensions/api/extension_action/extension_action_prefs_unittest.cc index 4c908ee..d0fdc0f 100644 --- a/chrome/browser/extensions/api/extension_action/extension_action_prefs_unittest.cc +++ b/chrome/browser/extensions/api/extension_action/extension_action_prefs_unittest.cc @@ -7,8 +7,8 @@ #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" +#include "chrome/browser/extensions/./extension_prefs_unittest.h" #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" -#include "chrome/browser/extensions/extension_prefs_unittest.h" #include "extensions/common/extension.h" namespace extensions { diff --git a/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc index 0e186b2..8172644 100644 --- a/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc @@ -9,7 +9,6 @@ #include "chrome/browser/extensions/extension_action_icon_factory.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" @@ -21,6 +20,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" diff --git a/chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc b/chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc index 8e02d1c..78eb12a 100644 --- a/chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc +++ b/chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc @@ -6,10 +6,10 @@ #include "base/file_util.h" #include "base/files/file_path.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/render_process_host.h" +#include "extensions/browser/extension_prefs.h" #include "net/base/mime_util.h" #include "webkit/browser/fileapi/isolated_context.h" #include "webkit/common/fileapi/file_system_mount_option.h" diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest.cc b/chrome/browser/extensions/api/file_system/file_system_apitest.cc index b65a39a..c878709 100644 --- a/chrome/browser/extensions/api/file_system/file_system_apitest.cc +++ b/chrome/browser/extensions/api/file_system/file_system_apitest.cc @@ -9,11 +9,11 @@ #include "chrome/browser/apps/app_browsertest_util.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/file_system/file_system_api.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_service.h" +#include "extensions/browser/extension_prefs.h" namespace extensions { 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 db72a6d..aa4f0bc 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc @@ -20,7 +20,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/file_system/file_system_api.h" #include "chrome/browser/extensions/blob_reader.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/media_galleries/media_file_system_registry.h" #include "chrome/browser/media_galleries/media_galleries_dialog_controller.h" #include "chrome/browser/media_galleries/media_galleries_histograms.h" @@ -39,6 +38,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/permissions_data.h" diff --git a/chrome/browser/extensions/api/module/module.cc b/chrome/browser/extensions/api/module/module.cc index b24d16e..1d74237 100644 --- a/chrome/browser/extensions/api/module/module.cc +++ b/chrome/browser/extensions/api/module/module.cc @@ -7,12 +7,12 @@ #include <string> #include "base/values.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/manifest_url_handler.h" +#include "extensions/browser/extension_prefs.h" namespace extensions { diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc index 7e253a0..5435461 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc +++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc @@ -11,7 +11,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/tab_helper.h" @@ -24,6 +23,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/extensions/api/permissions/permissions_api.cc b/chrome/browser/extensions/api/permissions/permissions_api.cc index 3d50593..c26635d 100644 --- a/chrome/browser/extensions/api/permissions/permissions_api.cc +++ b/chrome/browser/extensions/api/permissions/permissions_api.cc @@ -7,10 +7,10 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/permissions_updater.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/permissions.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permission_message_provider.h" diff --git a/chrome/browser/extensions/api/permissions/permissions_apitest.cc b/chrome/browser/extensions/api/permissions/permissions_apitest.cc index e3e1552..a2cacb7 100644 --- a/chrome/browser/extensions/api/permissions/permissions_apitest.cc +++ b/chrome/browser/extensions/api/permissions/permissions_apitest.cc @@ -4,10 +4,10 @@ #include "chrome/browser/extensions/api/permissions/permissions_api.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/switches.h" #include "net/dns/mock_host_resolver.h" diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc index 77143f2..2c98bed 100644 --- a/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chrome/browser/extensions/api/preference/preference_api.cc @@ -17,15 +17,15 @@ #include "chrome/browser/extensions/api/preference/preference_api_constants.h" #include "chrome/browser/extensions/api/preference/preference_helpers.h" #include "chrome/browser/extensions/api/proxy/proxy_api.h" -#include "chrome/browser/extensions/extension_pref_value_map.h" -#include "chrome/browser/extensions/extension_pref_value_map_factory.h" -#include "chrome/browser/extensions/extension_prefs_factory.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_pref_value_map.h" +#include "extensions/browser/extension_pref_value_map_factory.h" +#include "extensions/browser/extension_prefs_factory.h" #include "extensions/browser/pref_names.h" #include "extensions/common/error_utils.h" #include "extensions/common/permissions/api_permission.h" diff --git a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc index 63adc0b..bd40808 100644 --- a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc +++ b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc @@ -8,11 +8,11 @@ #include "base/memory/scoped_ptr.h" #include "base/prefs/mock_pref_change_callback.h" #include "base/values.h" +#include "chrome/browser/extensions/./extension_prefs_unittest.h" #include "chrome/browser/extensions/api/preference/preference_api.h" -#include "chrome/browser/extensions/extension_prefs.h" -#include "chrome/browser/extensions/extension_prefs_unittest.h" #include "chrome/test/base/testing_profile.h" #include "components/user_prefs/pref_registry_syncable.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/api/preference/preference_helpers.cc b/chrome/browser/extensions/api/preference/preference_helpers.cc index c0235ab..61ab636 100644 --- a/chrome/browser/extensions/api/preference/preference_helpers.cc +++ b/chrome/browser/extensions/api/preference/preference_helpers.cc @@ -8,12 +8,12 @@ #include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/extensions/api/preference/preference_api.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/manifest_handlers/incognito_info.h" namespace extensions { diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc index dbed7c1..c3d8434 100644 --- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc +++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc @@ -8,8 +8,6 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/preference/preference_api.h" -#include "chrome/browser/extensions/extension_prefs.h" -#include "chrome/browser/extensions/extension_prefs_factory.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service_factory.h" @@ -17,6 +15,8 @@ #include "chrome/common/pref_names.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_prefs_factory.h" #include "extensions/common/error_utils.h" #include "extensions/common/manifest_constants.h" diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.cc b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.cc index 9b3ea1d..434a2c8 100644 --- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.cc +++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.cc @@ -8,12 +8,12 @@ #include "base/memory/scoped_vector.h" #include "base/values.h" #include "chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/glue/device_info.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/common/extensions/api/signed_in_devices.h" +#include "extensions/browser/extension_prefs.h" using base::DictionaryValue; using browser_sync::DeviceInfo; diff --git a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc index 7e3aa58..81977d0 100644 --- a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc +++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc @@ -13,7 +13,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/storage/policy_value_store.h" #include "chrome/browser/extensions/api/storage/settings_storage_factory.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/policy/profile_policy_connector.h" @@ -33,6 +32,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc index 6f09057..fb77c84 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api.cc @@ -30,7 +30,6 @@ #include "chrome/browser/extensions/api/web_request/web_request_api_constants.h" #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h" #include "chrome/browser/extensions/api/web_request/web_request_time_tracker.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_renderer_state.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" @@ -49,6 +48,7 @@ #include "content/public/browser/resource_request_info.h" #include "content/public/browser/user_metrics.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/browser/info_map.h" #include "extensions/common/error_utils.h" #include "extensions/common/event_filtering_info.h" diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc index 566ac8d..572a4d8 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc @@ -18,7 +18,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" @@ -39,6 +38,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/extensions/blacklist.cc b/chrome/browser/extensions/blacklist.cc index 756a249..dc4439f 100644 --- a/chrome/browser/extensions/blacklist.cc +++ b/chrome/browser/extensions/blacklist.cc @@ -15,12 +15,12 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/blacklist_state_fetcher.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_prefs.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/blacklist_unittest.cc b/chrome/browser/extensions/blacklist_unittest.cc index 647b984..09bb575 100644 --- a/chrome/browser/extensions/blacklist_unittest.cc +++ b/chrome/browser/extensions/blacklist_unittest.cc @@ -8,12 +8,12 @@ #include "base/stl_util.h" #include "chrome/browser/extensions/blacklist.h" #include "chrome/browser/extensions/blacklist_state_fetcher.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/fake_safe_browsing_database_manager.h" #include "chrome/browser/extensions/test_blacklist.h" #include "chrome/browser/extensions/test_blacklist_state_fetcher.h" #include "chrome/browser/extensions/test_extension_prefs.h" #include "content/public/test/test_browser_thread_bundle.h" +#include "extensions/browser/extension_prefs.h" #include "testing/gtest/include/gtest/gtest.h" namespace extensions { diff --git a/chrome/browser/extensions/chrome_app_sorting.cc b/chrome/browser/extensions/chrome_app_sorting.cc index be210e2..84ed787 100644 --- a/chrome/browser/extensions/chrome_app_sorting.cc +++ b/chrome/browser/extensions/chrome_app_sorting.cc @@ -8,10 +8,10 @@ #include <vector> #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_scoped_prefs.h" #include "chrome/browser/extensions/extension_sync_service.h" #include "chrome/common/extensions/extension_constants.h" #include "content/public/browser/notification_service.h" +#include "extensions/browser/extension_scoped_prefs.h" #include "extensions/common/extension.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/extensions/chrome_app_sorting.h b/chrome/browser/extensions/chrome_app_sorting.h index fcb5b47..b943357 100644 --- a/chrome/browser/extensions/chrome_app_sorting.h +++ b/chrome/browser/extensions/chrome_app_sorting.h @@ -10,8 +10,8 @@ #include <string> #include "base/basictypes.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "extensions/browser/app_sorting.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "sync/api/string_ordinal.h" diff --git a/chrome/browser/extensions/chrome_app_sorting_unittest.cc b/chrome/browser/extensions/chrome_app_sorting_unittest.cc index b405214..e32668d 100644 --- a/chrome/browser/extensions/chrome_app_sorting_unittest.cc +++ b/chrome/browser/extensions/chrome_app_sorting_unittest.cc @@ -6,7 +6,7 @@ #include <map> -#include "chrome/browser/extensions/extension_prefs_unittest.h" +#include "chrome/browser/extensions/./extension_prefs_unittest.h" #include "chrome/common/extensions/extension_constants.h" #include "extensions/common/manifest_constants.h" #include "sync/api/string_ordinal.h" diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc index 5ed2495..6928e29 100644 --- a/chrome/browser/extensions/chrome_extensions_browser_client.cc +++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc @@ -9,7 +9,6 @@ #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/chrome_app_sorting.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/profiles/profile.h" @@ -20,6 +19,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/browser/pref_names.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/extensions/dev_mode_bubble_controller.cc b/chrome/browser/extensions/dev_mode_bubble_controller.cc index b8eb88d..6845105 100644 --- a/chrome/browser/extensions/dev_mode_bubble_controller.cc +++ b/chrome/browser/extensions/dev_mode_bubble_controller.cc @@ -11,7 +11,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_message_bubble.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" @@ -19,6 +18,7 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/feature_switch.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc index 5c6e7fc..924d086 100644 --- a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc +++ b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc @@ -8,7 +8,6 @@ #include "base/threading/sequenced_worker_pool.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/extensions/extension_browsertest.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_sync_service.h" #include "chrome/browser/extensions/updater/extension_updater.h" @@ -21,6 +20,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/test/test_utils.h" #include "content/test/net/url_request_prepackaged_interceptor.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "net/url_request/url_fetcher.h" diff --git a/chrome/browser/extensions/extension_message_bubble_controller.cc b/chrome/browser/extensions/extension_message_bubble_controller.cc index f85e9b6..f088db9 100644 --- a/chrome/browser/extensions/extension_message_bubble_controller.cc +++ b/chrome/browser/extensions/extension_message_bubble_controller.cc @@ -8,12 +8,12 @@ #include "base/metrics/histogram.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_message_bubble.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/common/url_constants.h" #include "content/public/browser/user_metrics.h" +#include "extensions/browser/extension_prefs.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc index b3d191e..e54bd12 100644 --- a/chrome/browser/extensions/extension_messages_apitest.cc +++ b/chrome/browser/extensions/extension_messages_apitest.cc @@ -15,7 +15,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/messaging/incognito_connectability.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/test_extension_dir.h" #include "chrome/browser/profiles/profile.h" @@ -29,6 +28,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/test/browser_test_utils.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_prefs.h" #include "net/cert/asn1_util.h" #include "net/cert/jwk_serializer.h" #include "net/dns/mock_host_resolver.h" diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc index a7338b9..01b401b 100644 --- a/chrome/browser/extensions/extension_prefs_unittest.cc +++ b/chrome/browser/extensions/extension_prefs_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/extensions/extension_prefs_unittest.h" +#include "chrome/browser/extensions/./extension_prefs_unittest.h" #include "base/basictypes.h" #include "base/files/scoped_temp_dir.h" @@ -14,14 +14,14 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/values.h" -#include "chrome/browser/extensions/extension_pref_value_map.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/common/chrome_paths.h" #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/test/mock_notification_observer.h" +#include "extensions/browser/extension_pref_value_map.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/permission_set.h" diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h index a388b98..14167ef 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h @@ -20,12 +20,12 @@ #include "base/strings/string16.h" #include "chrome/browser/extensions/blacklist.h" #include "chrome/browser/extensions/extension_function_histogram_value.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_sync_service.h" #include "chrome/common/extensions/extension_constants.h" #include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/browser/external_provider_interface.h" #include "extensions/browser/management_policy.h" #include "extensions/browser/pending_extension_manager.h" diff --git a/chrome/browser/extensions/extension_sync_service.cc b/chrome/browser/extensions/extension_sync_service.cc index 1fb29b5..39ab123 100644 --- a/chrome/browser/extensions/extension_sync_service.cc +++ b/chrome/browser/extensions/extension_sync_service.cc @@ -11,7 +11,6 @@ #include "base/threading/thread_restrictions.h" #include "chrome/browser/extensions/app_sync_data.h" #include "chrome/browser/extensions/extension_error_ui.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_sync_data.h" #include "chrome/browser/extensions/extension_sync_service_factory.h" @@ -23,6 +22,7 @@ #include "chrome/common/extensions/sync_helper.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/app_sorting.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" #include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" diff --git a/chrome/browser/extensions/extension_sync_service.h b/chrome/browser/extensions/extension_sync_service.h index 81c6a5b..5940b8b 100644 --- a/chrome/browser/extensions/extension_sync_service.h +++ b/chrome/browser/extensions/extension_sync_service.h @@ -10,10 +10,10 @@ #include "base/compiler_specific.h" #include "chrome/browser/extensions/app_sync_bundle.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_sync_bundle.h" #include "chrome/browser/extensions/pending_enables.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "sync/api/string_ordinal.h" #include "sync/api/sync_change.h" diff --git a/chrome/browser/extensions/extension_sync_service_factory.cc b/chrome/browser/extensions/extension_sync_service_factory.cc index cc3ca65..2d3aee9 100644 --- a/chrome/browser/extensions/extension_sync_service_factory.cc +++ b/chrome/browser/extensions/extension_sync_service_factory.cc @@ -5,13 +5,13 @@ #include "chrome/browser/extensions/extension_sync_service_factory.h" #include "base/prefs/pref_service.h" -#include "chrome/browser/extensions/extension_prefs_factory.h" #include "chrome/browser/extensions/extension_sync_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "extensions/browser/extension_prefs_factory.h" // static ExtensionSyncService* ExtensionSyncServiceFactory::GetForProfile( @@ -41,7 +41,7 @@ BrowserContextKeyedService* Profile* profile = Profile::FromBrowserContext(context); return new ExtensionSyncService( profile, - extensions::ExtensionPrefsFactory::GetForBrowserContext(profile), + extensions::ExtensionPrefsFactory::GetForBrowserContext(context), extensions::ExtensionSystemFactory::GetForProfile(profile)-> extension_service()); } diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc index 80ef736..33565b2 100644 --- a/chrome/browser/extensions/extension_system.cc +++ b/chrome/browser/extensions/extension_system.cc @@ -15,10 +15,6 @@ #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/error_console/error_console.h" #include "chrome/browser/extensions/extension_error_reporter.h" -#include "chrome/browser/extensions/extension_pref_store.h" -#include "chrome/browser/extensions/extension_pref_value_map.h" -#include "chrome/browser/extensions/extension_pref_value_map_factory.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/extension_util.h" @@ -39,6 +35,10 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/url_data_source.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_pref_store.h" +#include "extensions/browser/extension_pref_value_map.h" +#include "extensions/browser/extension_pref_value_map_factory.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/browser/info_map.h" #include "extensions/browser/lazy_background_task_queue.h" #include "extensions/browser/management_policy.h" diff --git a/chrome/browser/extensions/extension_system_factory.cc b/chrome/browser/extensions/extension_system_factory.cc index bfe1b51..5e4bc29 100644 --- a/chrome/browser/extensions/extension_system_factory.cc +++ b/chrome/browser/extensions/extension_system_factory.cc @@ -4,12 +4,12 @@ #include "chrome/browser/extensions/extension_system_factory.h" -#include "chrome/browser/extensions/extension_prefs_factory.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/policy/profile_policy_connector_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "extensions/browser/extension_prefs_factory.h" #include "extensions/browser/extension_registry_factory.h" #include "extensions/browser/extensions_browser_client.h" diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc index 68e2d67a..d4946fb 100644 --- a/chrome/browser/extensions/extension_toolbar_model.cc +++ b/chrome/browser/extensions/extension_toolbar_model.cc @@ -13,7 +13,6 @@ #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/extension_toolbar_model_factory.h" @@ -26,6 +25,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/browser/pref_names.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" diff --git a/chrome/browser/extensions/extension_toolbar_model.h b/chrome/browser/extensions/extension_toolbar_model.h index ac8aec7..f64bc83 100644 --- a/chrome/browser/extensions/extension_toolbar_model.h +++ b/chrome/browser/extensions/extension_toolbar_model.h @@ -8,10 +8,10 @@ #include "base/compiler_specific.h" #include "base/observer_list.h" #include "base/prefs/pref_change_registrar.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" class Browser; @@ -21,7 +21,7 @@ class Profile; // Model for the browser actions toolbar. class ExtensionToolbarModel : public content::NotificationObserver, - public BrowserContextKeyedService { + public BrowserContextKeyedService { public: ExtensionToolbarModel(Profile* profile, extensions::ExtensionPrefs* extension_prefs); diff --git a/chrome/browser/extensions/extension_toolbar_model_factory.cc b/chrome/browser/extensions/extension_toolbar_model_factory.cc index 474c6a0..3f725a3 100644 --- a/chrome/browser/extensions/extension_toolbar_model_factory.cc +++ b/chrome/browser/extensions/extension_toolbar_model_factory.cc @@ -4,12 +4,12 @@ #include "chrome/browser/extensions/extension_toolbar_model_factory.h" -#include "chrome/browser/extensions/extension_prefs.h" -#include "chrome/browser/extensions/extension_prefs_factory.h" #include "chrome/browser/extensions/extension_toolbar_model.h" #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/profiles/profile.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_prefs_factory.h" // static ExtensionToolbarModel* ExtensionToolbarModelFactory::GetForProfile( diff --git a/chrome/browser/extensions/extension_util.cc b/chrome/browser/extensions/extension_util.cc index 47402c8..3f3d8be 100644 --- a/chrome/browser/extensions/extension_util.cc +++ b/chrome/browser/extensions/extension_util.cc @@ -5,13 +5,13 @@ #include "chrome/browser/extensions/extension_util.h" #include "base/command_line.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_sync_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/sync_helper.h" #include "content/public/browser/site_instance.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" #include "extensions/common/extension.h" #include "extensions/common/manifest.h" diff --git a/chrome/browser/extensions/install_tracker.cc b/chrome/browser/extensions/install_tracker.cc index a0dcd4e..6750302 100644 --- a/chrome/browser/extensions/install_tracker.cc +++ b/chrome/browser/extensions/install_tracker.cc @@ -6,9 +6,9 @@ #include "base/bind.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/browser/pref_names.h" namespace extensions { diff --git a/chrome/browser/extensions/install_verifier.cc b/chrome/browser/extensions/install_verifier.cc index 752ab20..7f06c68 100644 --- a/chrome/browser/extensions/install_verifier.cc +++ b/chrome/browser/extensions/install_verifier.cc @@ -13,12 +13,12 @@ #include "base/metrics/histogram.h" #include "base/prefs/pref_service.h" #include "base/stl_util.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/install_signer.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/pref_names.h" #include "content/public/common/content_switches.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/browser/pref_names.h" #include "extensions/common/manifest.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc index 90a6569..4a07ac7 100644 --- a/chrome/browser/extensions/installed_loader.cc +++ b/chrome/browser/extensions/installed_loader.cc @@ -13,7 +13,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/runtime/runtime_api.h" #include "chrome/browser/extensions/extension_action_manager.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile_manager.h" @@ -25,6 +24,7 @@ #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/browser/management_policy.h" #include "extensions/common/extension.h" #include "extensions/common/manifest.h" diff --git a/chrome/browser/extensions/launch_util.cc b/chrome/browser/extensions/launch_util.cc index e1f4d6f..2d265cf 100644 --- a/chrome/browser/extensions/launch_util.cc +++ b/chrome/browser/extensions/launch_util.cc @@ -6,12 +6,12 @@ #include "base/command_line.h" #include "base/values.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #if defined(OS_WIN) diff --git a/chrome/browser/extensions/permissions_updater.cc b/chrome/browser/extensions/permissions_updater.cc index 279767aa..390b003 100644 --- a/chrome/browser/extensions/permissions_updater.cc +++ b/chrome/browser/extensions/permissions_updater.cc @@ -9,7 +9,6 @@ #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/permissions.h" @@ -19,6 +18,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permissions_data.h" diff --git a/chrome/browser/extensions/standard_management_policy_provider.cc b/chrome/browser/extensions/standard_management_policy_provider.cc index 923e70c..c9b9e4f 100644 --- a/chrome/browser/extensions/standard_management_policy_provider.cc +++ b/chrome/browser/extensions/standard_management_policy_provider.cc @@ -6,9 +6,9 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/extensions/blacklist.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/common/pref_names.h" #include "extensions/browser/admin_policy.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/browser/pref_names.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/extensions/standard_management_policy_provider_unittest.cc b/chrome/browser/extensions/standard_management_policy_provider_unittest.cc index 09cdba2..34c1969 100644 --- a/chrome/browser/extensions/standard_management_policy_provider_unittest.cc +++ b/chrome/browser/extensions/standard_management_policy_provider_unittest.cc @@ -6,10 +6,10 @@ #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/blacklist.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/standard_management_policy_provider.h" #include "chrome/browser/extensions/test_extension_prefs.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/suspicious_extension_bubble_controller.cc b/chrome/browser/extensions/suspicious_extension_bubble_controller.cc index daf97c6..26f142f 100644 --- a/chrome/browser/extensions/suspicious_extension_bubble_controller.cc +++ b/chrome/browser/extensions/suspicious_extension_bubble_controller.cc @@ -9,12 +9,12 @@ #include "base/metrics/histogram.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_message_bubble.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/common/url_constants.h" #include "content/public/browser/user_metrics.h" +#include "extensions/browser/extension_prefs.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc index e129bc0..1ea7138 100644 --- a/chrome/browser/extensions/test_extension_prefs.cc +++ b/chrome/browser/extensions/test_extension_prefs.cc @@ -16,13 +16,13 @@ #include "base/sequenced_task_runner.h" #include "base/synchronization/waitable_event.h" #include "base/values.h" -#include "chrome/browser/extensions/extension_pref_store.h" -#include "chrome/browser/extensions/extension_pref_value_map.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/prefs/pref_service_mock_factory.h" #include "chrome/browser/prefs/pref_service_syncable.h" #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/extension_pref_store.h" +#include "extensions/browser/extension_pref_value_map.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" diff --git a/chrome/browser/extensions/test_extension_system.cc b/chrome/browser/extensions/test_extension_system.cc index 10f39e6..afc546b 100644 --- a/chrome/browser/extensions/test_extension_system.cc +++ b/chrome/browser/extensions/test_extension_system.cc @@ -8,10 +8,6 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/extensions/blacklist.h" #include "chrome/browser/extensions/error_console/error_console.h" -#include "chrome/browser/extensions/extension_pref_value_map.h" -#include "chrome/browser/extensions/extension_pref_value_map_factory.h" -#include "chrome/browser/extensions/extension_prefs.h" -#include "chrome/browser/extensions/extension_prefs_factory.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/install_verifier.h" @@ -23,6 +19,10 @@ #include "chrome/common/chrome_switches.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_pref_value_map.h" +#include "extensions/browser/extension_pref_value_map_factory.h" +#include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_prefs_factory.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/browser/info_map.h" #include "extensions/browser/management_policy.h" diff --git a/chrome/browser/extensions/unpacked_installer.cc b/chrome/browser/extensions/unpacked_installer.cc index b23e018..ac4d1d7 100644 --- a/chrome/browser/extensions/unpacked_installer.cc +++ b/chrome/browser/extensions/unpacked_installer.cc @@ -12,13 +12,13 @@ #include "base/threading/thread_restrictions.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_install_ui.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/permissions_updater.h" #include "chrome/common/extensions/api/plugins/plugins_handler.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/extensions/extension_l10n_util.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "extensions/common/id_util.h" #include "extensions/common/manifest.h" diff --git a/chrome/browser/extensions/webstore_standalone_installer.cc b/chrome/browser/extensions/webstore_standalone_installer.cc index 9f5e41a..4866189 100644 --- a/chrome/browser/extensions/webstore_standalone_installer.cc +++ b/chrome/browser/extensions/webstore_standalone_installer.cc @@ -8,12 +8,12 @@ #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_install_ui.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/webstore_data_fetcher.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "url/gurl.h" diff --git a/chrome/browser/media_galleries/media_galleries_dialog_controller.cc b/chrome/browser/media_galleries/media_galleries_dialog_controller.cc index 91d0bd3..6d425e90 100644 --- a/chrome/browser/media_galleries/media_galleries_dialog_controller.cc +++ b/chrome/browser/media_galleries/media_galleries_dialog_controller.cc @@ -10,7 +10,6 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/file_system/file_system_api.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/media_galleries/media_file_system_registry.h" #include "chrome/browser/media_galleries/media_galleries_histograms.h" #include "chrome/browser/profiles/profile.h" @@ -20,6 +19,7 @@ #include "chrome/common/extensions/permissions/media_galleries_permission.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/permissions_data.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/media_galleries/media_galleries_permissions_unittest.cc b/chrome/browser/media_galleries/media_galleries_permissions_unittest.cc index dfc0642..f8c2a76 100644 --- a/chrome/browser/media_galleries/media_galleries_permissions_unittest.cc +++ b/chrome/browser/media_galleries/media_galleries_permissions_unittest.cc @@ -4,8 +4,7 @@ #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" -#include "chrome/browser/extensions/extension_prefs.h" -#include "chrome/browser/extensions/extension_prefs_unittest.h" +#include "chrome/browser/extensions/./extension_prefs_unittest.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/media_galleries/media_galleries_preferences.h" @@ -14,6 +13,7 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread.h" +#include "extensions/browser/extension_prefs.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/media_galleries/media_galleries_test_util.cc b/chrome/browser/media_galleries/media_galleries_test_util.cc index b75313c..582263f 100644 --- a/chrome/browser/media_galleries/media_galleries_test_util.cc +++ b/chrome/browser/media_galleries/media_galleries_test_util.cc @@ -13,12 +13,12 @@ #include "base/files/file_path.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/media_galleries/fileapi/picasa_finder.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 9007d16..0bb4081 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -25,7 +25,6 @@ #include "chrome/browser/extensions/activity_log/activity_log.h" #include "chrome/browser/extensions/api/commands/command_service.h" #include "chrome/browser/extensions/api/tabs/tabs_api.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_web_ui.h" #include "chrome/browser/extensions/external_component_loader.h" #include "chrome/browser/external_protocol/external_protocol_handler.h" @@ -98,6 +97,7 @@ #include "components/autofill/core/browser/autofill_manager.h" #include "components/user_prefs/pref_registry_syncable.h" #include "content/public/browser/render_process_host.h" +#include "extensions/browser/extension_prefs.h" #if defined(ENABLE_AUTOFILL_DIALOG) #include "chrome/browser/ui/autofill/autofill_dialog_controller.h" diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc index 8dbcae9..f60e967 100644 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc @@ -102,7 +102,6 @@ #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" #include "chrome/browser/extensions/api/web_request/web_request_api.h" #include "chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.h" -#include "chrome/browser/extensions/extension_prefs_factory.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/extension_toolbar_model_factory.h" #include "chrome/browser/extensions/extension_web_ui_override_registrar.h" @@ -110,6 +109,7 @@ #include "chrome/browser/extensions/menu_manager_factory.h" #include "chrome/browser/extensions/plugin_manager.h" #include "chrome/browser/extensions/token_cache/token_cache_service_factory.h" +#include "extensions/browser/extension_prefs_factory.h" #endif // defined(ENABLE_EXTENSIONS) #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index bea6eff..44cf198 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -35,9 +35,6 @@ #include "chrome/browser/download/chrome_download_manager_delegate.h" #include "chrome/browser/download/download_service.h" #include "chrome/browser/download/download_service_factory.h" -#include "chrome/browser/extensions/extension_pref_store.h" -#include "chrome/browser/extensions/extension_pref_value_map.h" -#include "chrome/browser/extensions/extension_pref_value_map_factory.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_special_storage_policy.h" #include "chrome/browser/extensions/extension_system.h" @@ -94,6 +91,9 @@ #include "content/public/browser/storage_partition.h" #include "content/public/browser/user_metrics.h" #include "content/public/common/content_constants.h" +#include "extensions/browser/extension_pref_store.h" +#include "extensions/browser/extension_pref_value_map.h" +#include "extensions/browser/extension_pref_value_map_factory.h" #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/sync_file_system/sync_file_system_service.cc b/chrome/browser/sync_file_system/sync_file_system_service.cc index ae21073..ceaec19 100644 --- a/chrome/browser/sync_file_system/sync_file_system_service.cc +++ b/chrome/browser/sync_file_system/sync_file_system_service.cc @@ -14,7 +14,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.h" #include "chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" @@ -31,6 +30,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/storage_partition.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "url/gurl.h" diff --git a/chrome/browser/tab_contents/render_view_context_menu_unittest.cc b/chrome/browser/tab_contents/render_view_context_menu_unittest.cc index 88e7bfe..960ec39 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_unittest.cc +++ b/chrome/browser/tab_contents/render_view_context_menu_unittest.cc @@ -7,12 +7,12 @@ #include "base/prefs/pref_service.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" #include "chrome/browser/tab_contents/render_view_context_menu_test_util.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/url_pattern.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/web/WebContextMenuData.h" diff --git a/chrome/browser/ui/app_list/app_list_syncable_service.cc b/chrome/browser/ui/app_list/app_list_syncable_service.cc index 68c6522..c7d96bd 100644 --- a/chrome/browser/ui/app_list/app_list_syncable_service.cc +++ b/chrome/browser/ui/app_list/app_list_syncable_service.cc @@ -6,7 +6,6 @@ #include "base/command_line.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" @@ -16,6 +15,7 @@ #include "chrome/browser/ui/host_desktop.h" #include "chrome/common/chrome_switches.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/extension_prefs.h" #include "sync/api/sync_change_processor.h" #include "sync/api/sync_data.h" #include "sync/api/sync_merge_result.h" diff --git a/chrome/browser/ui/app_list/extension_app_item.cc b/chrome/browser/ui/app_list/extension_app_item.cc index 7715988..033f7a1 100644 --- a/chrome/browser/ui/app_list/extension_app_item.cc +++ b/chrome/browser/ui/app_list/extension_app_item.cc @@ -5,7 +5,6 @@ #include "chrome/browser/ui/app_list/extension_app_item.h" #include "base/prefs/pref_service.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" @@ -22,6 +21,7 @@ #include "chrome/common/extensions/manifest_url_handler.h" #include "content/public/browser/user_metrics.h" #include "extensions/browser/app_sorting.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "grit/theme_resources.h" #include "sync/api/string_ordinal.h" diff --git a/chrome/browser/ui/app_list/extension_app_model_builder.cc b/chrome/browser/ui/app_list/extension_app_model_builder.cc index 2db886e..68ff0e8 100644 --- a/chrome/browser/ui/app_list/extension_app_model_builder.cc +++ b/chrome/browser/ui/app_list/extension_app_model_builder.cc @@ -9,7 +9,8 @@ #include "base/auto_reset.h" #include "base/prefs/pref_service.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_prefs.h" +#include "chrome/browser/extensions/extension_service.h" +#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/install_tracker.h" #include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/profiles/profile.h" @@ -20,6 +21,7 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/ui/app_list/recommended_apps.cc b/chrome/browser/ui/app_list/recommended_apps.cc index 71441d9..15e2fd9 100644 --- a/chrome/browser/ui/app_list/recommended_apps.cc +++ b/chrome/browser/ui/app_list/recommended_apps.cc @@ -8,13 +8,13 @@ #include <vector> #include "base/bind.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/install_tracker.h" #include "chrome/browser/extensions/install_tracker_factory.h" #include "chrome/browser/ui/app_list/recommended_apps_observer.h" #include "chrome/common/pref_names.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/browser/pref_names.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index eacd4cf..89b39da 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -52,7 +52,6 @@ #include "chrome/browser/download/download_service_factory.h" #include "chrome/browser/download/download_shelf.h" #include "chrome/browser/extensions/browser_extension_window_controller.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/tab_helper.h" @@ -173,6 +172,7 @@ #include "content/public/common/page_zoom.h" #include "content/public/common/renderer_preferences.h" #include "content/public/common/webplugininfo.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/background_info.h" diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc index 227e967a..6151b07 100644 --- a/chrome/browser/ui/extensions/application_launch.cc +++ b/chrome/browser/ui/extensions/application_launch.cc @@ -14,7 +14,6 @@ #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/apps/per_app_settings_service.h" #include "chrome/browser/apps/per_app_settings_service_factory.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/launch_util.h" @@ -41,6 +40,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/renderer_preferences.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/ui/panels/base_panel_browser_test.cc b/chrome/browser/ui/panels/base_panel_browser_test.cc index b19e171..3288400 100644 --- a/chrome/browser/ui/panels/base_panel_browser_test.cc +++ b/chrome/browser/ui/panels/base_panel_browser_test.cc @@ -11,7 +11,6 @@ #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -30,6 +29,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/common/url_constants.h" #include "content/public/test/web_contents_tester.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/manifest_constants.h" #include "sync/api/string_ordinal.h" diff --git a/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc b/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc index 0fd3bc6..26d5eec 100644 --- a/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc +++ b/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc @@ -9,7 +9,6 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/dev_mode_bubble_controller.h" #include "chrome/browser/extensions/extension_action_manager.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/suspicious_extension_bubble_controller.h" @@ -18,6 +17,7 @@ #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" +#include "extensions/browser/extension_prefs.h" #include "grit/locale_settings.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc index 9bd7db8..d4481df 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc @@ -13,7 +13,6 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/threading/thread.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/image_loader.h" @@ -23,6 +22,7 @@ #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" #include "chrome/common/url_constants.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "extensions/common/extension_resource.h" #include "grit/component_extension_resources_map.h" diff --git a/chrome/browser/ui/webui/extensions/extension_info_ui.cc b/chrome/browser/ui/webui/extensions/extension_info_ui.cc index fa26fa3..31d466c 100644 --- a/chrome/browser/ui/webui/extensions/extension_info_ui.cc +++ b/chrome/browser/ui/webui/extensions/extension_info_ui.cc @@ -8,7 +8,6 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" @@ -19,6 +18,7 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc index 5ce25c5..2faa068 100644 --- a/chrome/browser/ui/webui/options/core_options_handler.cc +++ b/chrome/browser/ui/webui/options/core_options_handler.cc @@ -14,8 +14,6 @@ #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_pref_value_map.h" -#include "chrome/browser/extensions/extension_pref_value_map_factory.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" @@ -27,6 +25,8 @@ #include "content/public/browser/notification_types.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_ui.h" +#include "extensions/browser/extension_pref_value_map.h" +#include "extensions/browser/extension_pref_value_map_factory.h" #include "extensions/common/extension.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi index aad6288..1412e3e 100644 --- a/chrome/chrome_browser_extensions.gypi +++ b/chrome/chrome_browser_extensions.gypi @@ -736,23 +736,12 @@ 'browser/extensions/extension_message_bubble_controller.h', 'browser/extensions/policy_handlers.cc', 'browser/extensions/policy_handlers.h', - 'browser/extensions/extension_pref_store.cc', - 'browser/extensions/extension_pref_store.h', - 'browser/extensions/extension_pref_value_map.cc', - 'browser/extensions/extension_pref_value_map.h', - 'browser/extensions/extension_pref_value_map_factory.cc', - 'browser/extensions/extension_pref_value_map_factory.h', - 'browser/extensions/extension_prefs.cc', - 'browser/extensions/extension_prefs.h', - 'browser/extensions/extension_prefs_factory.cc', - 'browser/extensions/extension_prefs_factory.h', 'browser/extensions/extension_protocols.cc', 'browser/extensions/extension_protocols.h', 'browser/extensions/extension_renderer_state.cc', 'browser/extensions/extension_renderer_state.h', 'browser/extensions/extension_resource_protocols.cc', 'browser/extensions/extension_resource_protocols.h', - 'browser/extensions/extension_scoped_prefs.h', 'browser/extensions/extension_service.cc', 'browser/extensions/extension_service.h', 'browser/extensions/extension_special_storage_policy.cc', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 47652f7..aa271d9 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -529,6 +529,7 @@ '../extensions/browser/admin_policy_unittest.cc', '../extensions/browser/event_listener_map_unittest.cc', '../extensions/browser/event_router_unittest.cc', + '../extensions/browser/extension_pref_value_map_unittest.cc', '../extensions/browser/extension_registry_unittest.cc', '../extensions/browser/file_highlighter_unittest.cc', '../extensions/browser/file_reader_unittest.cc', @@ -906,7 +907,6 @@ 'browser/extensions/extension_icon_image_unittest.cc', 'browser/extensions/extension_icon_manager_unittest.cc', 'browser/extensions/extension_message_bubble_controller_unittest.cc', - 'browser/extensions/extension_pref_value_map_unittest.cc', 'browser/extensions/extension_prefs_unittest.cc', 'browser/extensions/extension_prefs_unittest.h', 'browser/extensions/extension_protocols_unittest.cc', diff --git a/extensions/browser/DEPS b/extensions/browser/DEPS index a2c9650..65d427b 100644 --- a/extensions/browser/DEPS +++ b/extensions/browser/DEPS @@ -1,5 +1,6 @@ include_rules = [ "+components/browser_context_keyed_service", + "+components/user_prefs", "+content/public/browser", "+sync", @@ -10,11 +11,12 @@ include_rules = [ # # TODO(jamescook): Remove these. http://crbug.com/162530 "+chrome/browser/chrome_notification_types.h", + "+chrome/browser/extensions/api/content_settings/content_settings_store.h", + "+chrome/browser/extensions/api/preference/preference_api.h", "+chrome/browser/extensions/api/runtime/runtime_api.h", "+chrome/browser/extensions/extension_function_dispatcher.h", "+chrome/browser/extensions/extension_function_histogram_value.h", "+chrome/browser/extensions/extension_host.h", - "+chrome/browser/extensions/extension_prefs.h", "+chrome/browser/extensions/extension_service.h", "+chrome/browser/extensions/extension_system.h", "+chrome/browser/extensions/extension_util.h", diff --git a/extensions/browser/app_sorting.h b/extensions/browser/app_sorting.h index 967fb46..ede93f1 100644 --- a/extensions/browser/app_sorting.h +++ b/extensions/browser/app_sorting.h @@ -1,4 +1,4 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. +// Copyright (c) 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,6 +8,7 @@ #include <string> #include "base/basictypes.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/common/extension.h" #include "sync/api/string_ordinal.h" diff --git a/extensions/browser/event_router.cc b/extensions/browser/event_router.cc index dbef450..763b3ff 100644 --- a/extensions/browser/event_router.cc +++ b/extensions/browser/event_router.cc @@ -13,13 +13,13 @@ #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/common/extensions/extension_messages.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/browser/lazy_background_task_queue.h" diff --git a/chrome/browser/extensions/extension_pref_store.cc b/extensions/browser/extension_pref_store.cc index 281e0e1..3f26cbb3 100644 --- a/chrome/browser/extensions/extension_pref_store.cc +++ b/extensions/browser/extension_pref_store.cc @@ -1,11 +1,11 @@ -// 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/browser/extensions/extension_pref_store.h" +#include "extensions/browser/extension_pref_store.h" #include "base/values.h" -#include "chrome/browser/extensions/extension_pref_value_map.h" +#include "extensions/browser/extension_pref_value_map.h" ExtensionPrefStore::ExtensionPrefStore( ExtensionPrefValueMap* extension_pref_value_map, diff --git a/chrome/browser/extensions/extension_pref_store.h b/extensions/browser/extension_pref_store.h index 068219e..d93018c 100644 --- a/chrome/browser/extensions/extension_pref_store.h +++ b/extensions/browser/extension_pref_store.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_BROWSER_EXTENSIONS_EXTENSION_PREF_STORE_H_ -#define CHROME_BROWSER_EXTENSIONS_EXTENSION_PREF_STORE_H_ +#ifndef EXTENSIONS_BROWSER_EXTENSION_PREF_STORE_H_ +#define EXTENSIONS_BROWSER_EXTENSION_PREF_STORE_H_ #include <string> #include "base/prefs/value_map_pref_store.h" -#include "chrome/browser/extensions/extension_pref_value_map.h" +#include "extensions/browser/extension_pref_value_map.h" // A (non-persistent) PrefStore implementation that holds effective preferences // set by extensions. These preferences are managed by and fetched from an @@ -35,4 +35,4 @@ class ExtensionPrefStore : public ValueMapPrefStore, DISALLOW_COPY_AND_ASSIGN(ExtensionPrefStore); }; -#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_PREF_STORE_H_ +#endif // EXTENSIONS_BROWSER_EXTENSION_PREF_STORE_H_ diff --git a/chrome/browser/extensions/extension_pref_value_map.cc b/extensions/browser/extension_pref_value_map.cc index bcc4380..5cba7e5 100644 --- a/chrome/browser/extensions/extension_pref_value_map.cc +++ b/extensions/browser/extension_pref_value_map.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/browser/extensions/extension_pref_value_map.h" +#include "extensions/browser/extension_pref_value_map.h" #include "base/prefs/pref_value_map.h" #include "base/stl_util.h" diff --git a/chrome/browser/extensions/extension_pref_value_map.h b/extensions/browser/extension_pref_value_map.h index 96d356e..48f30d9 100644 --- a/chrome/browser/extensions/extension_pref_value_map.h +++ b/extensions/browser/extension_pref_value_map.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_BROWSER_EXTENSIONS_EXTENSION_PREF_VALUE_MAP_H_ -#define CHROME_BROWSER_EXTENSIONS_EXTENSION_PREF_VALUE_MAP_H_ +#ifndef EXTENSIONS_BROWSER_EXTENSION_PREF_VALUE_MAP_H_ +#define EXTENSIONS_BROWSER_EXTENSION_PREF_VALUE_MAP_H_ #include <map> #include <set> @@ -195,4 +195,4 @@ class ExtensionPrefValueMap : public BrowserContextKeyedService { DISALLOW_COPY_AND_ASSIGN(ExtensionPrefValueMap); }; -#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_PREF_VALUE_MAP_H_ +#endif // EXTENSIONS_BROWSER_EXTENSION_PREF_VALUE_MAP_H_ diff --git a/chrome/browser/extensions/extension_pref_value_map_factory.cc b/extensions/browser/extension_pref_value_map_factory.cc index bc926ea..c8d3bfb 100644 --- a/chrome/browser/extensions/extension_pref_value_map_factory.cc +++ b/extensions/browser/extension_pref_value_map_factory.cc @@ -1,11 +1,11 @@ -// 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/browser/extensions/extension_pref_value_map_factory.h" +#include "extensions/browser/extension_pref_value_map_factory.h" -#include "chrome/browser/extensions/extension_pref_value_map.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" +#include "extensions/browser/extension_pref_value_map.h" ExtensionPrefValueMapFactory::ExtensionPrefValueMapFactory() : BrowserContextKeyedServiceFactory( diff --git a/chrome/browser/extensions/extension_pref_value_map_factory.h b/extensions/browser/extension_pref_value_map_factory.h index 3689265..84537d3 100644 --- a/chrome/browser/extensions/extension_pref_value_map_factory.h +++ b/extensions/browser/extension_pref_value_map_factory.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_BROWSER_EXTENSIONS_EXTENSION_PREF_VALUE_MAP_FACTORY_H_ -#define CHROME_BROWSER_EXTENSIONS_EXTENSION_PREF_VALUE_MAP_FACTORY_H_ +#ifndef EXTENSIONS_BROWSER_EXTENSION_PREF_VALUE_MAP_FACTORY_H_ +#define EXTENSIONS_BROWSER_EXTENSION_PREF_VALUE_MAP_FACTORY_H_ #include "base/memory/singleton.h" #include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h" @@ -28,4 +28,4 @@ class ExtensionPrefValueMapFactory : public BrowserContextKeyedServiceFactory { content::BrowserContext* context) const OVERRIDE; }; -#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_PREF_VALUE_MAP_FACTORY_H_ +#endif // EXTENSIONS_BROWSER_EXTENSION_PREF_VALUE_MAP_FACTORY_H_ diff --git a/chrome/browser/extensions/extension_pref_value_map_unittest.cc b/extensions/browser/extension_pref_value_map_unittest.cc index 4b8db2f..35fa3c6 100644 --- a/chrome/browser/extensions/extension_pref_value_map_unittest.cc +++ b/extensions/browser/extension_pref_value_map_unittest.cc @@ -1,4 +1,4 @@ -// 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. @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "base/prefs/pref_store_observer_mock.h" #include "base/values.h" -#include "chrome/browser/extensions/extension_pref_value_map.h" +#include "extensions/browser/extension_pref_value_map.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/extension_prefs.cc b/extensions/browser/extension_prefs.cc index 9f416a0..8e56ed7 100644 --- a/chrome/browser/extensions/extension_prefs.cc +++ b/extensions/browser/extension_prefs.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/browser/extensions/extension_prefs.h" +#include "extensions/browser/extension_prefs.h" #include <iterator> @@ -14,12 +14,12 @@ #include "base/value_conversions.h" #include "chrome/browser/extensions/api/content_settings/content_settings_store.h" #include "chrome/browser/extensions/api/preference/preference_api.h" -#include "chrome/browser/extensions/extension_pref_store.h" -#include "chrome/browser/extensions/extension_prefs_factory.h" #include "components/user_prefs/pref_registry_syncable.h" #include "extensions/browser/admin_policy.h" #include "extensions/browser/app_sorting.h" #include "extensions/browser/event_router.h" +#include "extensions/browser/extension_pref_store.h" +#include "extensions/browser/extension_prefs_factory.h" #include "extensions/browser/pref_names.h" #include "extensions/common/feature_switch.h" #include "extensions/common/manifest.h" @@ -27,7 +27,6 @@ #include "extensions/common/permissions/permissions_info.h" #include "extensions/common/url_pattern.h" #include "extensions/common/user_script.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" using base::Value; @@ -1683,7 +1682,7 @@ ExtensionPrefs::ExtensionPrefs( content_settings_store_(new ContentSettingsStore()), time_provider_(time_provider.Pass()), extensions_disabled_(extensions_disabled) { - app_sorting_->SetExtensionScopedPrefs(this), + app_sorting_->SetExtensionScopedPrefs(this); MakePathsRelative(); InitPrefStore(); } diff --git a/chrome/browser/extensions/extension_prefs.h b/extensions/browser/extension_prefs.h index cc8d510..2525b36 100644 --- a/chrome/browser/extensions/extension_prefs.h +++ b/extensions/browser/extension_prefs.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_BROWSER_EXTENSIONS_EXTENSION_PREFS_H_ -#define CHROME_BROWSER_EXTENSIONS_EXTENSION_PREFS_H_ +#ifndef EXTENSIONS_BROWSER_EXTENSION_PREFS_H_ +#define EXTENSIONS_BROWSER_EXTENSION_PREFS_H_ #include <set> #include <string> @@ -14,9 +14,9 @@ #include "base/prefs/scoped_user_pref_update.h" #include "base/time/time.h" #include "base/values.h" -#include "chrome/browser/extensions/extension_scoped_prefs.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "extensions/browser/app_sorting.h" +#include "extensions/browser/extension_scoped_prefs.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/url_pattern_set.h" @@ -610,13 +610,14 @@ class ExtensionPrefs : public ExtensionScopedPrefs, const syncer::StringOrdinal& suggested_page_ordinal, base::DictionaryValue* extension_dict); - // The pref service specific to this set of extension prefs. Owned by profile. + // The pref service specific to this set of extension prefs. Owned by the + // BrowserContext. PrefService* prefs_; // Base extensions install directory. base::FilePath install_directory_; - // Weak pointer, owned by Profile. + // Weak pointer, owned by BrowserContext. ExtensionPrefValueMap* extension_pref_value_map_; // Contains all the logic for handling the order for various extension @@ -634,4 +635,4 @@ class ExtensionPrefs : public ExtensionScopedPrefs, } // namespace extensions -#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_PREFS_H_ +#endif // EXTENSIONS_BROWSER_EXTENSION_PREFS_H_ diff --git a/chrome/browser/extensions/extension_prefs_factory.cc b/extensions/browser/extension_prefs_factory.cc index e0bb1ba..e83e33b 100644 --- a/chrome/browser/extensions/extension_prefs_factory.cc +++ b/extensions/browser/extension_prefs_factory.cc @@ -1,17 +1,15 @@ -// 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 "base/command_line.h" #include "base/prefs/pref_service.h" -#include "chrome/browser/extensions/extension_pref_value_map.h" -#include "chrome/browser/extensions/extension_pref_value_map_factory.h" -#include "chrome/browser/extensions/extension_prefs.h" -#include "chrome/browser/extensions/extension_prefs_factory.h" -#include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/profiles/incognito_helpers.h" #include "components/browser_context_keyed_service/browser_context_dependency_manager.h" #include "content/public/browser/browser_context.h" +#include "extensions/browser/extension_pref_value_map.h" +#include "extensions/browser/extension_pref_value_map_factory.h" +#include "extensions/browser/extension_prefs.h" +#include "extensions/browser/extension_prefs_factory.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/common/constants.h" @@ -36,8 +34,8 @@ void ExtensionPrefsFactory::SetInstanceForTesting( ExtensionPrefsFactory::ExtensionPrefsFactory() : BrowserContextKeyedServiceFactory( - "ExtensionPrefs", - BrowserContextDependencyManager::GetInstance()) { + "ExtensionPrefs", + BrowserContextDependencyManager::GetInstance()) { } ExtensionPrefsFactory::~ExtensionPrefsFactory() { diff --git a/chrome/browser/extensions/extension_prefs_factory.h b/extensions/browser/extension_prefs_factory.h index 911f949..3aee29a 100644 --- a/chrome/browser/extensions/extension_prefs_factory.h +++ b/extensions/browser/extension_prefs_factory.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_BROWSER_EXTENSIONS_EXTENSION_PREFS_FACTORY_H_ -#define CHROME_BROWSER_EXTENSIONS_EXTENSION_PREFS_FACTORY_H_ +#ifndef EXTENSIONS_BROWSER_EXTENSION_PREFS_FACTORY_H_ +#define EXTENSIONS_BROWSER_EXTENSION_PREFS_FACTORY_H_ #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" @@ -36,4 +36,4 @@ class ExtensionPrefsFactory : public BrowserContextKeyedServiceFactory { } // namespace extensions -#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_PREFS_FACTORY_H_ +#endif // EXTENSIONS_BROWSER_EXTENSION_PREFS_FACTORY_H_ diff --git a/chrome/browser/extensions/extension_scoped_prefs.h b/extensions/browser/extension_scoped_prefs.h index 75b27cc..15fc577 100644 --- a/chrome/browser/extensions/extension_scoped_prefs.h +++ b/extensions/browser/extension_scoped_prefs.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_BROWSER_EXTENSIONS_EXTENSION_SCOPED_PREFS_H_ -#define CHROME_BROWSER_EXTENSIONS_EXTENSION_SCOPED_PREFS_H_ +#ifndef EXTENSIONS_BROWSER_EXTENSION_SCOPED_PREFS_H_ +#define EXTENSIONS_BROWSER_EXTENSION_SCOPED_PREFS_H_ namespace extensions { @@ -53,4 +53,4 @@ class ExtensionScopedPrefs { } // namespace extensions -#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SCOPED_PREFS_H_ +#endif // EXTENSIONS_BROWSER_EXTENSION_SCOPED_PREFS_H_ diff --git a/extensions/browser/extensions_browser_client.h b/extensions/browser/extensions_browser_client.h index 46405a0..ee7fde3 100644 --- a/extensions/browser/extensions_browser_client.h +++ b/extensions/browser/extensions_browser_client.h @@ -60,7 +60,7 @@ class ExtensionsBrowserClient { virtual content::BrowserContext* GetOffTheRecordContext( content::BrowserContext* context) = 0; - // Return the original "recording" context. This method returns |context| if + // Returns the original "recording" context. This method returns |context| if // |context| is not incognito. virtual content::BrowserContext* GetOriginalContext( content::BrowserContext* context) = 0; diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp index 725c675..7ad28d0f5 100644 --- a/extensions/extensions.gyp +++ b/extensions/extensions.gyp @@ -172,15 +172,26 @@ 'browser/event_listener_map.h', 'browser/event_router.cc', 'browser/event_router.h', - 'browser/extension_prefs_scope.h', 'browser/extension_error.cc', 'browser/extension_error.h', 'browser/extension_function.cc', 'browser/extension_function.h', + 'browser/extension_pref_store.cc', + 'browser/extension_pref_store.h', + 'browser/extension_pref_value_map.cc', + 'browser/extension_pref_value_map_factory.cc', + 'browser/extension_pref_value_map_factory.h', + 'browser/extension_pref_value_map.h', + 'browser/extension_prefs.cc', + 'browser/extension_prefs.h', + 'browser/extension_prefs_factory.cc', + 'browser/extension_prefs_factory.h', + 'browser/extension_prefs_scope.h', 'browser/extension_registry.cc', 'browser/extension_registry.h', 'browser/extension_registry_factory.cc', 'browser/extension_registry_factory.h', + 'browser/extension_scoped_prefs.h', 'browser/extensions_browser_client.cc', 'browser/extensions_browser_client.h', 'browser/external_provider_interface.h', |