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/profile_sync_service.h" | 5 #include "chrome/browser/sync/profile_sync_service.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <map> | 8 #include <map> |
9 #include <ostream> | 9 #include <ostream> |
10 #include <set> | 10 #include <set> |
(...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
848 | 848 |
849 void ProfileSyncService::PromptForExistingPassphrase() { | 849 void ProfileSyncService::PromptForExistingPassphrase() { |
850 if (WizardIsVisible()) { | 850 if (WizardIsVisible()) { |
851 wizard_.Focus(); | 851 wizard_.Focus(); |
852 return; | 852 return; |
853 } | 853 } |
854 | 854 |
855 ShowSyncSetup(SyncSetupWizard::ENTER_PASSPHRASE); | 855 ShowSyncSetup(SyncSetupWizard::ENTER_PASSPHRASE); |
856 } | 856 } |
857 | 857 |
858 void ProfileSyncService::ShowSyncSetup(SyncSetupWizard::State state) { | 858 void ProfileSyncService::ShowSyncSetup(SyncSetupWizard::State state) { |
Andrew T Wilson (Slow)
2011/07/07 17:44:23
So, I'm wondering if we should just completely get
tim (not reviewing)
2011/07/07 17:49:47
hm. wizard_.Step is supposed to do exactly that; a
| |
859 wizard_.Step(state); | 859 wizard_.Step(state); |
860 BrowserList::GetLastActiveWithProfile(profile())->ShowOptionsTab( | 860 wizard_.ShowSyncSetup(); |
861 chrome::kSyncSetupSubPage); | |
862 } | 861 } |
863 | 862 |
864 SyncBackendHost::StatusSummary ProfileSyncService::QuerySyncStatusSummary() { | 863 SyncBackendHost::StatusSummary ProfileSyncService::QuerySyncStatusSummary() { |
865 if (backend_.get() && backend_initialized_) | 864 if (backend_.get() && backend_initialized_) |
866 return backend_->GetStatusSummary(); | 865 return backend_->GetStatusSummary(); |
867 else | 866 else |
868 return SyncBackendHost::Status::OFFLINE_UNUSABLE; | 867 return SyncBackendHost::Status::OFFLINE_UNUSABLE; |
869 } | 868 } |
870 | 869 |
871 SyncBackendHost::Status ProfileSyncService::QueryDetailedSyncStatus() { | 870 SyncBackendHost::Status ProfileSyncService::QueryDetailedSyncStatus() { |
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1436 // is initialized, all enabled data types are consistent with one | 1435 // is initialized, all enabled data types are consistent with one |
1437 // another, and no unrecoverable error has transpired. | 1436 // another, and no unrecoverable error has transpired. |
1438 if (unrecoverable_error_detected_) | 1437 if (unrecoverable_error_detected_) |
1439 return false; | 1438 return false; |
1440 | 1439 |
1441 if (!data_type_manager_.get()) | 1440 if (!data_type_manager_.get()) |
1442 return false; | 1441 return false; |
1443 | 1442 |
1444 return data_type_manager_->state() == DataTypeManager::CONFIGURED; | 1443 return data_type_manager_->state() == DataTypeManager::CONFIGURED; |
1445 } | 1444 } |
OLD | NEW |