Index: chrome/browser/sync/sync_setup_flow.cc |
=================================================================== |
--- chrome/browser/sync/sync_setup_flow.cc (revision 56023) |
+++ chrome/browser/sync/sync_setup_flow.cc (working copy) |
@@ -106,6 +106,12 @@ |
if (sync_extensions) |
data_types->insert(syncable::EXTENSIONS); |
+ bool sync_sessions; |
+ if (!result->GetBoolean(L"syncSessions", &sync_sessions)) |
+ return false; |
+ if (sync_sessions) |
+ data_types->insert(syncable::SESSIONS); |
+ |
bool sync_typed_urls; |
if (!result->GetBoolean(L"syncTypedUrls", &sync_typed_urls)) |
return false; |
@@ -182,7 +188,6 @@ |
// Called by SyncSetupFlow::Advance. |
void FlowHandler::ShowChooseDataTypes(const DictionaryValue& args) { |
- |
// If you're starting the wizard at the Choose Data Types screen (i.e. from |
// "Customize Sync"), this will be redundant. However, if you're coming from |
// another wizard state, this will make sure Choose Data Types is on top. |
@@ -353,6 +358,8 @@ |
registered_types.count(syncable::EXTENSIONS) > 0); |
args->SetBoolean(L"typedUrlsRegistered", |
registered_types.count(syncable::TYPED_URLS) > 0); |
+ args->SetBoolean(L"sessionsRegistered", |
+ registered_types.count(syncable::SESSIONS) > 0); |
args->SetBoolean(L"syncBookmarks", |
service->profile()->GetPrefs()->GetBoolean(prefs::kSyncBookmarks)); |
@@ -366,6 +373,8 @@ |
service->profile()->GetPrefs()->GetBoolean(prefs::kSyncAutofill)); |
args->SetBoolean(L"syncExtensions", |
service->profile()->GetPrefs()->GetBoolean(prefs::kSyncExtensions)); |
+ args->SetBoolean(L"syncSessions", |
+ service->profile()->GetPrefs()->GetBoolean(prefs::kSyncSessions)); |
args->SetBoolean(L"syncTypedUrls", |
service->profile()->GetPrefs()->GetBoolean(prefs::kSyncTypedUrls)); |
} |