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

Side by Side Diff: sync/tools/sync_client.cc

Issue 10455012: [Sync] Add support for performing a GetKey on startup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fred's comments Created 8 years, 4 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <cstddef> 5 #include <cstddef>
6 #include <cstdio> 6 #include <cstdio>
7 #include <string> 7 #include <string>
8 8
9 #include "base/at_exit.h" 9 #include "base/at_exit.h"
10 #include "base/base64.h" 10 #include "base/base64.h"
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 kUseSsl, 355 kUseSsl,
356 blocking_task_runner, 356 blocking_task_runner,
357 post_factory.Pass(), 357 post_factory.Pass(),
358 workers, 358 workers,
359 extensions_activity_monitor, 359 extensions_activity_monitor,
360 &change_delegate, 360 &change_delegate,
361 credentials, 361 credentials,
362 scoped_ptr<SyncNotifier>( 362 scoped_ptr<SyncNotifier>(
363 sync_notifier_factory.CreateSyncNotifier()), 363 sync_notifier_factory.CreateSyncNotifier()),
364 kRestoredKeyForBootstrapping, 364 kRestoredKeyForBootstrapping,
365 true, // enable keystore encryption
365 scoped_ptr<InternalComponentsFactory>( 366 scoped_ptr<InternalComponentsFactory>(
366 new InternalComponentsFactoryImpl()), 367 new InternalComponentsFactoryImpl()),
367 &null_encryptor, 368 &null_encryptor,
368 &unrecoverable_error_handler, 369 &unrecoverable_error_handler,
369 &LogUnrecoverableErrorContext); 370 &LogUnrecoverableErrorContext);
370 // TODO(akalin): Avoid passing in model parameters multiple times by 371 // TODO(akalin): Avoid passing in model parameters multiple times by
371 // organizing handling of model types. 372 // organizing handling of model types.
372 sync_manager->UpdateEnabledTypes(model_types); 373 sync_manager->UpdateEnabledTypes(model_types);
373 sync_manager->StartSyncingNormally(routing_info); 374 sync_manager->StartSyncingNormally(routing_info);
374 375
375 sync_loop.Run(); 376 sync_loop.Run();
376 377
377 io_thread.Stop(); 378 io_thread.Stop();
378 return 0; 379 return 0;
379 } 380 }
380 381
381 } // namespace 382 } // namespace
382 } // namespace syncer 383 } // namespace syncer
383 384
384 int main(int argc, char* argv[]) { 385 int main(int argc, char* argv[]) {
385 return syncer::SyncClientMain(argc, argv); 386 return syncer::SyncClientMain(argc, argv);
386 } 387 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698