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

Side by Side Diff: components/browser_sync/profile_sync_service.cc

Issue 2644373003: Revert of [Sync] Make directory types registration explicit in ModelTypeRegistry (Closed)
Patch Set: Created 3 years, 11 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
« no previous file with comments | « no previous file | components/sync/driver/data_type_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "components/browser_sync/profile_sync_service.h" 5 #include "components/browser_sync/profile_sync_service.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cstddef> 9 #include <cstddef>
10 #include <map> 10 #include <map>
(...skipping 1428 matching lines...) Expand 10 before | Expand all | Expand 10 after
1439 ClearAndRestartSyncForPassphraseEncryption(); 1439 ClearAndRestartSyncForPassphraseEncryption();
1440 return; 1440 return;
1441 } 1441 }
1442 1442
1443 StartSyncingWithServer(); 1443 StartSyncingWithServer();
1444 } 1444 }
1445 1445
1446 void ProfileSyncService::OnConfigureStart() { 1446 void ProfileSyncService::OnConfigureStart() {
1447 DCHECK(thread_checker_.CalledOnValidThread()); 1447 DCHECK(thread_checker_.CalledOnValidThread());
1448 sync_configure_start_time_ = base::Time::Now(); 1448 sync_configure_start_time_ = base::Time::Now();
1449 engine_->StartConfiguration();
1450 NotifyObservers(); 1449 NotifyObservers();
1451 } 1450 }
1452 1451
1453 ProfileSyncService::SyncStatusSummary 1452 ProfileSyncService::SyncStatusSummary
1454 ProfileSyncService::QuerySyncStatusSummary() { 1453 ProfileSyncService::QuerySyncStatusSummary() {
1455 DCHECK(thread_checker_.CalledOnValidThread()); 1454 DCHECK(thread_checker_.CalledOnValidThread());
1456 if (HasUnrecoverableError()) { 1455 if (HasUnrecoverableError()) {
1457 return UNRECOVERABLE_ERROR; 1456 return UNRECOVERABLE_ERROR;
1458 } else if (!engine_) { 1457 } else if (!engine_) {
1459 return NOT_ENABLED; 1458 return NOT_ENABLED;
(...skipping 1174 matching lines...) Expand 10 before | Expand all | Expand 10 after
2634 2633
2635 DCHECK(startup_controller_->IsSetupInProgress()); 2634 DCHECK(startup_controller_->IsSetupInProgress());
2636 startup_controller_->SetSetupInProgress(false); 2635 startup_controller_->SetSetupInProgress(false);
2637 2636
2638 if (IsEngineInitialized()) 2637 if (IsEngineInitialized())
2639 ReconfigureDatatypeManager(); 2638 ReconfigureDatatypeManager();
2640 NotifyObservers(); 2639 NotifyObservers();
2641 } 2640 }
2642 2641
2643 } // namespace browser_sync 2642 } // namespace browser_sync
OLDNEW
« no previous file with comments | « no previous file | components/sync/driver/data_type_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698