diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-14 20:24:19 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-14 20:24:19 +0000 |
| commit | a6fddf4f98b6c8e0a4dbe22bcac6a64dbd82ea75 (patch) | |
| tree | 346b816eb88b4ed3b4a0610cdc18a458c051480f /chrome/browser/sync/glue | |
| parent | 9d47976a4e27c092a6730b47bb1fb59adce39f01 (diff) | |
| download | chromium_src-a6fddf4f98b6c8e0a4dbe22bcac6a64dbd82ea75.zip chromium_src-a6fddf4f98b6c8e0a4dbe22bcac6a64dbd82ea75.tar.gz chromium_src-a6fddf4f98b6c8e0a4dbe22bcac6a64dbd82ea75.tar.bz2 | |
[Sync] Make SESSIONS an implicit type
We add TABS as a new local type, which is now what is enabled via the user
settings. It implicitly enables SESSIONS.
Similarly, History now corresponds with Typed URLs, which implicitly enables
history delete directives if the proper command line flag is passed.
Finally, History delete directives implicitly enables SESSIONS, which we can do
because Sessions is no longer a user selectable type.
BUG=170162
TBR=jhawkins@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11961030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182527 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/glue')
| -rw-r--r-- | chrome/browser/sync/glue/model_association_manager.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/sync/glue/model_association_manager.cc b/chrome/browser/sync/glue/model_association_manager.cc index e748829..4dabe05 100644 --- a/chrome/browser/sync/glue/model_association_manager.cc +++ b/chrome/browser/sync/glue/model_association_manager.cc @@ -28,6 +28,7 @@ static const syncer::ModelType kStartOrder[] = { syncer::NIGORI, // Listed for completeness. syncer::DEVICE_INFO, // Listed for completeness. syncer::EXPERIMENTS, // Listed for completeness. + syncer::PROXY_TABS, // Listed for completeness. syncer::BOOKMARKS, // UI thread datatypes. syncer::PREFERENCES, syncer::PRIORITY_PREFERENCES, |