summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_common.gypi
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 20:01:52 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 20:01:52 +0000
commit03b9b4e1d4772cfb48c933f3ab0f93975eeb0224 (patch)
treec284b2fb69ae488f636a96fc8caf53b8bc59b8a4 /chrome/chrome_common.gypi
parent962115b4352af262091dd4987a729560a357d246 (diff)
downloadchromium_src-03b9b4e1d4772cfb48c933f3ab0f93975eeb0224.zip
chromium_src-03b9b4e1d4772cfb48c933f3ab0f93975eeb0224.tar.gz
chromium_src-03b9b4e1d4772cfb48c933f3ab0f93975eeb0224.tar.bz2
Move the bits of Prefs where production code has only trivially easy
to break dependencies back to Chrome. This leaves the following in chrome/ for now, which will move later: - PrefService, to move once sync dependencies and dependencies on Chrome-specific pref stores are externalized. - PrefNotifierImpl and PrefObserverMock, to move once NotificationSource dependency is broken. - PrefValueStore, to move once PrefModelAssociatior dependency is externalized. - ScopedUserPrefUpdate, to move once PrefService moves. TBR=ben@chromium.org BUG=155525 Review URL: https://chromiumcodereview.appspot.com/11243002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163354 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_common.gypi')
-rw-r--r--chrome/chrome_common.gypi13
1 files changed, 8 insertions, 5 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index e6e52ba5..c154ef8 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -220,8 +220,6 @@
'common/important_file_writer.h',
'common/instant_types.cc',
'common/instant_types.h',
- 'common/json_pref_store.cc',
- 'common/json_pref_store.h',
'common/json_schema_constants.cc',
'common/json_schema_constants.h',
'common/json_schema_validator.cc',
@@ -272,9 +270,6 @@
'common/password_generation_util.h',
'common/pepper_flash.cc',
'common/pepper_flash.h',
- 'common/persistent_pref_store.h',
- 'common/pref_store.cc',
- 'common/pref_store.h',
'common/print_messages.cc',
'common/print_messages.h',
'common/profiling.cc',
@@ -322,6 +317,14 @@
'common/zip_internal.h',
'common/zip_reader.cc',
'common/zip_reader.h',
+
+ # TODO(joi): Move to 'base_prefs' target in base/base.gyp once
+ # Prefs move is complete and dependencies have been broken.
+ '../base/prefs/json_pref_store.cc',
+ '../base/prefs/json_pref_store.h',
+ '../base/prefs/persistent_pref_store.h',
+ '../base/prefs/pref_store.cc',
+ '../base/prefs/pref_store.h',
],
'conditions': [
['OS != "ios"', {