Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(346)

Side by Side Diff: chrome/browser/sync/sync_setup_flow.cc

Issue 7669052: Added DataTypeController integration and UI surfacing for syncing Search Engines. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixed notification registration. Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 args->SetBoolean("passwordsRegistered", 142 args->SetBoolean("passwordsRegistered",
143 registered_types.count(syncable::PASSWORDS) > 0); 143 registered_types.count(syncable::PASSWORDS) > 0);
144 args->SetBoolean("autofillRegistered", 144 args->SetBoolean("autofillRegistered",
145 registered_types.count(syncable::AUTOFILL) > 0); 145 registered_types.count(syncable::AUTOFILL) > 0);
146 args->SetBoolean("extensionsRegistered", 146 args->SetBoolean("extensionsRegistered",
147 registered_types.count(syncable::EXTENSIONS) > 0); 147 registered_types.count(syncable::EXTENSIONS) > 0);
148 args->SetBoolean("typedUrlsRegistered", 148 args->SetBoolean("typedUrlsRegistered",
149 registered_types.count(syncable::TYPED_URLS) > 0); 149 registered_types.count(syncable::TYPED_URLS) > 0);
150 args->SetBoolean("appsRegistered", 150 args->SetBoolean("appsRegistered",
151 registered_types.count(syncable::APPS) > 0); 151 registered_types.count(syncable::APPS) > 0);
152 args->SetBoolean("searchEnginesRegistered",
153 registered_types.count(syncable::SEARCH_ENGINES) > 0);
152 args->SetBoolean("sessionsRegistered", 154 args->SetBoolean("sessionsRegistered",
153 registered_types.count(syncable::SESSIONS) > 0); 155 registered_types.count(syncable::SESSIONS) > 0);
154 args->SetBoolean("syncBookmarks", 156 args->SetBoolean("syncBookmarks",
155 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncBookmarks)); 157 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncBookmarks));
156 args->SetBoolean("syncPreferences", 158 args->SetBoolean("syncPreferences",
157 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncPreferences)); 159 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncPreferences));
158 args->SetBoolean("syncThemes", 160 args->SetBoolean("syncThemes",
159 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncThemes)); 161 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncThemes));
160 args->SetBoolean("syncPasswords", 162 args->SetBoolean("syncPasswords",
161 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncPasswords)); 163 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncPasswords));
162 args->SetBoolean("syncAutofill", 164 args->SetBoolean("syncAutofill",
163 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncAutofill)); 165 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncAutofill));
164 args->SetBoolean("syncExtensions", 166 args->SetBoolean("syncExtensions",
165 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncExtensions)); 167 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncExtensions));
168 args->SetBoolean("syncSearchEngines",
169 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncSearchEngines));
166 args->SetBoolean("syncSessions", 170 args->SetBoolean("syncSessions",
167 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncSessions)); 171 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncSessions));
168 args->SetBoolean("syncTypedUrls", 172 args->SetBoolean("syncTypedUrls",
169 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncTypedUrls)); 173 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncTypedUrls));
170 args->SetBoolean("syncApps", 174 args->SetBoolean("syncApps",
171 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncApps)); 175 service->profile()->GetPrefs()->GetBoolean(prefs::kSyncApps));
172 args->SetBoolean("encryptionEnabled", 176 args->SetBoolean("encryptionEnabled",
173 !CommandLine::ForCurrentProcess()->HasSwitch( 177 !CommandLine::ForCurrentProcess()->HasSwitch(
174 switches::kDisableSyncEncryption)); 178 switches::kDisableSyncEncryption));
175 179
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 break; 454 break;
451 } 455 }
452 case SyncSetupWizard::DONE: 456 case SyncSetupWizard::DONE:
453 flow_handler_->ShowSetupDone( 457 flow_handler_->ShowSetupDone(
454 UTF16ToWide(service_->GetAuthenticatedUsername())); 458 UTF16ToWide(service_->GetAuthenticatedUsername()));
455 break; 459 break;
456 default: 460 default:
457 NOTREACHED() << "Invalid advance state: " << state; 461 NOTREACHED() << "Invalid advance state: " << state;
458 } 462 }
459 } 463 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/resources/configure.html ('k') | chrome/browser/sync/sync_setup_wizard_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698