Client changes for disabled dasher account

chrome/browser/ui/sync/one_click_signin_sync_starter.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/sync/one_click_signin_sync_starter.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 
@@ skipping 202 matching lines @@
     SigninManager* new_signin_manager =
         SigninManagerFactory::GetForProfile(new_profile);
     DCHECK(!old_signin_manager->GetUsernameForAuthInProgress().empty());
     DCHECK(old_signin_manager->GetAuthenticatedUsername().empty());
     DCHECK(new_signin_manager->GetAuthenticatedUsername().empty());
     DCHECK(policy_client_);
 
     // Copy credentials from the old profile to the just-created profile,
     // and switch over to tracking that profile.
     new_signin_manager->CopyCredentialsFrom(*old_signin_manager);
-    ProfileSyncService* profile_sync_service = GetProfileSyncService();
-    if (profile_sync_service)
-      profile_sync_service->SetSetupInProgress(false);
+    FinishProfileSyncServiceSetup();
     Initialize(new_profile, NULL);
     DCHECK_EQ(profile_, new_profile);
 
     // We've transferred our credentials to the new profile - notify that
     // the signin for the original profile was cancelled (must do this after
     // we have called Initialize() with the new profile, as otherwise this
     // object will get freed when the signin on the old profile is cancelled.
     old_signin_manager->SignOut();
 
     // Load policy for the just-created profile - once policy has finished
@@ skipping 30 matching lines @@
     if (response == CONFIGURE_SYNC_FIRST)
       start_mode_ = response;
     SigninManager* signin = SigninManagerFactory::GetForProfile(profile_);
     signin->CompletePendingSignin();
   }
 }
 
 
 void OneClickSigninSyncStarter::SigninFailed(
     const GoogleServiceAuthError& error) {
-  ProfileSyncService* profile_sync_service = GetProfileSyncService();
-  if (profile_sync_service)
-    profile_sync_service->SetSetupInProgress(false);
+  FinishProfileSyncServiceSetup();
   if (confirmation_required_ == CONFIRM_AFTER_SIGNIN) {
     switch (error.state()) {
       case GoogleServiceAuthError::SERVICE_UNAVAILABLE:
         DisplayFinalConfirmationBubble(l10n_util::GetStringUTF16(
             IDS_SYNC_UNRECOVERABLE_ERROR));
         break;
       case GoogleServiceAuthError::REQUEST_CANCELED:
         // No error notification needed if the user manually cancelled signin.
         break;
       default:
         DisplayFinalConfirmationBubble(l10n_util::GetStringUTF16(
             IDS_SYNC_ERROR_SIGNING_IN));
         break;
     }
   }
   delete this;
 }
 
 void OneClickSigninSyncStarter::SigninSuccess() {
   ProfileSyncService* profile_sync_service = GetProfileSyncService();
   switch (start_mode_) {
     case SYNC_WITH_DEFAULT_SETTINGS:
       if (profile_sync_service) {
         // Just kick off the sync machine, no need to configure it first.
         profile_sync_service->OnUserChoseDatatypes(true,
                                                    syncer::ModelTypeSet());
         profile_sync_service->SetSyncSetupCompleted();
-        profile_sync_service->SetSetupInProgress(false);
       }
+      FinishProfileSyncServiceSetup();
       if (confirmation_required_ == CONFIRM_AFTER_SIGNIN) {
         string16 message;
         if (!profile_sync_service) {
           // Sync is disabled by policy.
           message = l10n_util::GetStringUTF16(
               IDS_ONE_CLICK_SIGNIN_BUBBLE_SYNC_DISABLED_MESSAGE);
         }
         DisplayFinalConfirmationBubble(message);
       }
       break;
@@ skipping 44 matching lines @@
     EnsureBrowser();
     if (profile_sync_service) {
       // Need to navigate to the settings page and display the sync UI.
       if (force_same_tab_navigation_) {
         ShowSyncSettingsPageOnSameTab();
       } else {
         chrome::ShowSettingsSubPage(browser_, chrome::kSyncSetupSubPage);
       }
     } else {
       // Sync is disabled - just display the settings page.
+      FinishProfileSyncServiceSetup();
       chrome::ShowSettings(browser_);
     }
   }
 }
 
 ProfileSyncService* OneClickSigninSyncStarter::GetProfileSyncService() {
   ProfileSyncService* service = NULL;
   if (profile_->IsSyncAccessible())
     service = ProfileSyncServiceFactory::GetForProfile(profile_);
   return service;
 }
 
+void OneClickSigninSyncStarter::FinishProfileSyncServiceSetup() {
+  ProfileSyncService* service =
+      ProfileSyncServiceFactory::GetForProfile(profile_);
+  if (service)
+    service->SetSetupInProgress(false);
+}
+
 void OneClickSigninSyncStarter::ShowSyncSettingsPageOnSameTab() {
   std::string url = std::string(chrome::kChromeUISettingsURL) +
       chrome::kSyncSetupSubPage;
   chrome::NavigateParams params(
       browser_, GURL(url), content::PAGE_TRANSITION_AUTO_TOPLEVEL);
   params.disposition = CURRENT_TAB;
   params.window_action = chrome::NavigateParams::SHOW_WINDOW;
   chrome::Navigate(&params);
 }