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

Unified Diff: chrome/browser/sync/profile_sync_service.cc

Issue 7193031: Move UI specific implementation from ProfileSyncService to SyncSetupFlowHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Upload after merge. Created 9 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/profile_sync_service.h ('k') | chrome/browser/sync/sync_setup_flow.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index da1b2522a3228a6131fda5c5ad14c64c1ea6972b..de4591cad51c80a7224bacb90d9b8944a64dcd4e 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -820,45 +820,24 @@ void ProfileSyncService::ShowLoginDialog() {
auth_error_time_ = base::TimeTicks(); // Reset auth_error_time_ to null.
}
- ShowSyncSetup(SyncSetupWizard::GAIA_LOGIN);
+ wizard_.ShowSyncSetup(SyncSetupWizard::GAIA_LOGIN);
NotifyObservers();
}
void ProfileSyncService::ShowErrorUI() {
- if (WizardIsVisible()) {
- wizard_.Focus();
- return;
- }
-
- ShowSyncSetup(SyncSetupWizard::NONFATAL_ERROR);
+ wizard_.ShowSyncSetup(SyncSetupWizard::NONFATAL_ERROR);
}
void ProfileSyncService::ShowConfigure(bool sync_everything) {
- if (WizardIsVisible()) {
- wizard_.Focus();
- return;
- }
-
if (sync_everything)
- ShowSyncSetup(SyncSetupWizard::SYNC_EVERYTHING);
+ wizard_.ShowSyncSetup(SyncSetupWizard::SYNC_EVERYTHING);
else
- ShowSyncSetup(SyncSetupWizard::CONFIGURE);
+ wizard_.ShowSyncSetup(SyncSetupWizard::CONFIGURE);
}
void ProfileSyncService::PromptForExistingPassphrase() {
- if (WizardIsVisible()) {
- wizard_.Focus();
- return;
- }
-
- ShowSyncSetup(SyncSetupWizard::ENTER_PASSPHRASE);
-}
-
-void ProfileSyncService::ShowSyncSetup(SyncSetupWizard::State state) {
- wizard_.Step(state);
- BrowserList::GetLastActiveWithProfile(profile())->ShowOptionsTab(
- chrome::kSyncSetupSubPage);
+ wizard_.ShowSyncSetup(SyncSetupWizard::ENTER_PASSPHRASE);
}
SyncBackendHost::StatusSummary ProfileSyncService::QuerySyncStatusSummary() {
« no previous file with comments | « chrome/browser/sync/profile_sync_service.h ('k') | chrome/browser/sync/sync_setup_flow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698