diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 20:01:52 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-22 20:01:52 +0000 |
| commit | 03b9b4e1d4772cfb48c933f3ab0f93975eeb0224 (patch) | |
| tree | c284b2fb69ae488f636a96fc8caf53b8bc59b8a4 /chrome/browser/sync | |
| parent | 962115b4352af262091dd4987a729560a357d246 (diff) | |
| download | chromium_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/browser/sync')
| -rw-r--r-- | chrome/browser/sync/credential_cache_service_win.h | 4 | ||||
| -rw-r--r-- | chrome/browser/sync/glue/typed_url_data_type_controller.h | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_mock.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/sync/credential_cache_service_win.h b/chrome/browser/sync/credential_cache_service_win.h index 2c0abfb..625f608 100644 --- a/chrome/browser/sync/credential_cache_service_win.h +++ b/chrome/browser/sync/credential_cache_service_win.h @@ -12,10 +12,10 @@ #include "base/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/json_pref_store.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "chrome/browser/sync/sync_prefs.h" -#include "chrome/common/json_pref_store.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/sync/glue/typed_url_data_type_controller.h b/chrome/browser/sync/glue/typed_url_data_type_controller.h index 258a7c2..650152a 100644 --- a/chrome/browser/sync/glue/typed_url_data_type_controller.h +++ b/chrome/browser/sync/glue/typed_url_data_type_controller.h @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "chrome/browser/api/prefs/pref_change_registrar.h" +#include "base/prefs/public/pref_change_registrar.h" #include "chrome/browser/common/cancelable_request.h" #include "chrome/browser/sync/glue/non_frontend_data_type_controller.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/sync/profile_sync_service_mock.cc b/chrome/browser/sync/profile_sync_service_mock.cc index e62e8f1..978aef9 100644 --- a/chrome/browser/sync/profile_sync_service_mock.cc +++ b/chrome/browser/sync/profile_sync_service_mock.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/prefs/testing_pref_store.h" #include "chrome/browser/prefs/pref_service.h" -#include "chrome/browser/prefs/testing_pref_store.h" #include "chrome/browser/signin/signin_manager_factory.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" |