diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 21:33:40 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 21:33:40 +0000 |
| commit | 34f5405bf386e659e2058aa232f2061f4586e0b4 (patch) | |
| tree | 95fe8e3192d8a27bf48782d42957080a64e53b8f /chrome/browser/sync/sessions2/sessions_sync_manager.h | |
| parent | 271b8dad376b640e0e42a18218fae1264cb0924c (diff) | |
| download | chromium_src-34f5405bf386e659e2058aa232f2061f4586e0b4.zip chromium_src-34f5405bf386e659e2058aa232f2061f4586e0b4.tar.gz chromium_src-34f5405bf386e659e2058aa232f2061f4586e0b4.tar.bz2 | |
[Sync] Move SyncPrefs into sync_driver component
This also moves all sync preferences out of the common pref_names file and into
a sync_driver specific pref_names. To allow that, the dependency on history
policy is moved into the typed_url_data_type_controller, and a dependency
on the deprecated acknowledged types pref is removed from ntp_resource_cache.
BUG=339726
R=blundell@chromium.org, mnissler@chromium.org, rlarocque@chromium.org
TBR=atwilson@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/195873020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258415 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/sessions2/sessions_sync_manager.h')
| -rw-r--r-- | chrome/browser/sync/sessions2/sessions_sync_manager.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/sync/sessions2/sessions_sync_manager.h b/chrome/browser/sync/sessions2/sessions_sync_manager.h index f118109..1c415a6 100644 --- a/chrome/browser/sync/sessions2/sessions_sync_manager.h +++ b/chrome/browser/sync/sessions2/sessions_sync_manager.h @@ -23,7 +23,7 @@ #include "chrome/browser/sync/glue/synced_session_tracker.h" #include "chrome/browser/sync/open_tabs_ui_delegate.h" #include "chrome/browser/sync/sessions2/tab_node_pool2.h" -#include "chrome/browser/sync/sync_prefs.h" +#include "components/sync_driver/sync_prefs.h" #include "sync/api/syncable_service.h" class Profile; @@ -347,7 +347,7 @@ class SessionsSyncManager : public syncer::SyncableService, // proves that we are still relevant. bool local_tab_pool_out_of_sync_; - SyncPrefs sync_prefs_; + sync_driver::SyncPrefs sync_prefs_; const Profile* const profile_; |