diff options
author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 18:20:03 +0000 |
---|---|---|
committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-22 18:20:03 +0000 |
commit | 489db0845d8070c3882a945fed1108acfb170185 (patch) | |
tree | f0a3a145789a6ba18c8fa4ebb4e786ae9360d1e5 /apps | |
parent | a78957254f0072472366a75531f7e585cb23ff2c (diff) | |
download | chromium_src-489db0845d8070c3882a945fed1108acfb170185.zip chromium_src-489db0845d8070c3882a945fed1108acfb170185.tar.gz chromium_src-489db0845d8070c3882a945fed1108acfb170185.tar.bz2 |
Move ExtensionPrefs and friends to extensions/ directory.
Move ExtensionPrefs and related classes from
chrome/browser/extensions/ to the top-level extensions/
directory. The following classes are moved:
ExtensionPrefStore
ExtensionPrefValueMap
ExtensionPrefValueMapFactory
ExtensionPrefs
ExtensionPrefsFactory
ExtensionScopedPref
The TestExtensionPrefs helper class and the
ExtensionPrefsTest unit tests remain in
chrome/browser/extensions, since TestExtensionPrefs has a
dependency on Chrome's PrefServiceSyncable that seems like it
will be difficult to break (more explanation at
https://codereview.chromium.org/108643002/).
BUG=313284
TBR=sky@chromium.org,pam@chromium.org
Review URL: https://codereview.chromium.org/46853004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246373 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_load_service.cc | 2 | ||||
-rw-r--r-- | apps/app_load_service_factory.cc | 2 | ||||
-rw-r--r-- | apps/app_restore_service.cc | 2 | ||||
-rw-r--r-- | apps/app_restore_service_browsertest.cc | 2 | ||||
-rw-r--r-- | apps/launcher.cc | 2 | ||||
-rw-r--r-- | apps/saved_files_service.cc | 2 | ||||
-rw-r--r-- | apps/saved_files_service_unittest.cc | 2 | ||||
-rw-r--r-- | apps/shell/shell_extension_system.cc | 2 | ||||
-rw-r--r-- | apps/shell/shell_extensions_browser_client.cc | 4 | ||||
-rw-r--r-- | apps/shell_window_geometry_cache.cc | 4 | ||||
-rw-r--r-- | apps/shell_window_geometry_cache_unittest.cc | 2 |
11 files changed, 13 insertions, 13 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"; |