OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/sync/sync_setup_flow.h" | 5 #include "chrome/browser/sync/sync_setup_flow.h" |
6 | 6 |
7 #include "base/callback.h" | 7 #include "base/callback.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
10 #include "base/json/json_writer.h" | 10 #include "base/json/json_writer.h" |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 args->SetBoolean("showSyncEverythingPage", false); | 121 args->SetBoolean("showSyncEverythingPage", false); |
122 | 122 |
123 args->SetBoolean("syncAllDataTypes", | 123 args->SetBoolean("syncAllDataTypes", |
124 service->profile()->GetPrefs()->GetBoolean( | 124 service->profile()->GetPrefs()->GetBoolean( |
125 prefs::kSyncKeepEverythingSynced)); | 125 prefs::kSyncKeepEverythingSynced)); |
126 | 126 |
127 // Bookmarks, Preferences, and Themes are launched for good, there's no | 127 // Bookmarks, Preferences, and Themes are launched for good, there's no |
128 // going back now. Check if the other data types are registered though. | 128 // going back now. Check if the other data types are registered though. |
129 syncable::ModelTypeSet registered_types; | 129 syncable::ModelTypeSet registered_types; |
130 service->GetRegisteredDataTypes(®istered_types); | 130 service->GetRegisteredDataTypes(®istered_types); |
| 131 syncable::ModelTypeSet preferred_types; |
| 132 service->GetPreferredDataTypes(&preferred_types); |
131 args->SetBoolean("passwordsRegistered", | 133 args->SetBoolean("passwordsRegistered", |
132 registered_types.count(syncable::PASSWORDS) > 0); | 134 registered_types.count(syncable::PASSWORDS) > 0); |
133 args->SetBoolean("autofillRegistered", | 135 args->SetBoolean("autofillRegistered", |
134 registered_types.count(syncable::AUTOFILL) > 0); | 136 registered_types.count(syncable::AUTOFILL) > 0); |
135 args->SetBoolean("extensionsRegistered", | 137 args->SetBoolean("extensionsRegistered", |
136 registered_types.count(syncable::EXTENSIONS) > 0); | 138 registered_types.count(syncable::EXTENSIONS) > 0); |
137 args->SetBoolean("typedUrlsRegistered", | 139 args->SetBoolean("typedUrlsRegistered", |
138 registered_types.count(syncable::TYPED_URLS) > 0); | 140 registered_types.count(syncable::TYPED_URLS) > 0); |
139 args->SetBoolean("appsRegistered", | 141 args->SetBoolean("appsRegistered", |
140 registered_types.count(syncable::APPS) > 0); | 142 registered_types.count(syncable::APPS) > 0); |
141 args->SetBoolean("searchEnginesRegistered", | 143 args->SetBoolean("searchEnginesRegistered", |
142 registered_types.count(syncable::SEARCH_ENGINES) > 0); | 144 registered_types.count(syncable::SEARCH_ENGINES) > 0); |
143 args->SetBoolean("sessionsRegistered", | 145 args->SetBoolean("sessionsRegistered", |
144 registered_types.count(syncable::SESSIONS) > 0); | 146 registered_types.count(syncable::SESSIONS) > 0); |
145 args->SetBoolean("syncBookmarks", | 147 args->SetBoolean("syncBookmarks", |
146 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncBookmarks)); | 148 preferred_types.count(syncable::BOOKMARKS) > 0); |
147 args->SetBoolean("syncPreferences", | 149 args->SetBoolean("syncPreferences", |
148 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncPreferences)); | 150 preferred_types.count(syncable::PREFERENCES) > 0); |
149 args->SetBoolean("syncThemes", | 151 args->SetBoolean("syncThemes", |
150 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncThemes)); | 152 preferred_types.count(syncable::THEMES) > 0); |
151 args->SetBoolean("syncPasswords", | 153 args->SetBoolean("syncPasswords", |
152 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncPasswords)); | 154 preferred_types.count(syncable::PASSWORDS) > 0); |
153 args->SetBoolean("syncAutofill", | 155 args->SetBoolean("syncAutofill", |
154 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncAutofill)); | 156 preferred_types.count(syncable::AUTOFILL) > 0); |
155 args->SetBoolean("syncExtensions", | 157 args->SetBoolean("syncExtensions", |
156 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncExtensions)); | 158 preferred_types.count(syncable::EXTENSIONS) > 0); |
157 args->SetBoolean("syncSearchEngines", | 159 args->SetBoolean("syncSearchEngines", |
158 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncSearchEngines)); | 160 preferred_types.count(syncable::SEARCH_ENGINES) > 0); |
159 args->SetBoolean("syncSessions", | 161 args->SetBoolean("syncSessions", |
160 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncSessions)); | 162 preferred_types.count(syncable::SESSIONS) > 0); |
161 args->SetBoolean("syncTypedUrls", | 163 args->SetBoolean("syncTypedUrls", |
162 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncTypedUrls)); | 164 preferred_types.count(syncable::TYPED_URLS) > 0); |
163 args->SetBoolean("syncApps", | 165 args->SetBoolean("syncApps", |
164 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncApps)); | 166 preferred_types.count(syncable::APPS) > 0); |
| 167 |
165 args->SetBoolean("encryptionEnabled", | 168 args->SetBoolean("encryptionEnabled", |
166 !CommandLine::ForCurrentProcess()->HasSwitch( | 169 !CommandLine::ForCurrentProcess()->HasSwitch( |
167 switches::kDisableSyncEncryption)); | 170 switches::kDisableSyncEncryption)); |
168 | 171 |
169 bool encrypt_all = service->EncryptEverythingEnabled(); | 172 bool encrypt_all = service->EncryptEverythingEnabled(); |
170 if (service->encryption_pending()) | 173 if (service->encryption_pending()) |
171 encrypt_all = true; | 174 encrypt_all = true; |
172 args->SetBoolean("encryptAllData", encrypt_all); | 175 args->SetBoolean("encryptAllData", encrypt_all); |
173 | 176 |
174 // Load the parameters for the encryption tab. | 177 // Load the parameters for the encryption tab. |
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
495 } | 498 } |
496 case SyncSetupWizard::DONE: | 499 case SyncSetupWizard::DONE: |
497 case SyncSetupWizard::ABORT: | 500 case SyncSetupWizard::ABORT: |
498 flow_handler_->ShowSetupDone( | 501 flow_handler_->ShowSetupDone( |
499 UTF16ToWide(service_->GetAuthenticatedUsername())); | 502 UTF16ToWide(service_->GetAuthenticatedUsername())); |
500 break; | 503 break; |
501 default: | 504 default: |
502 NOTREACHED() << "Invalid advance state: " << state; | 505 NOTREACHED() << "Invalid advance state: " << state; |
503 } | 506 } |
504 } | 507 } |
OLD | NEW |