Facelifts to sync UI

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2006-2008 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.
 
 #ifdef CHROME_PERSONALIZATION
 #include "chrome/browser/sync/profile_sync_service.h"
 
 #include <stack>
 #include <vector>
 
@@ skipping 194 matching lines @@
   profile_->GetPrefs()->SetInt64(prefs::kSyncLastSyncedTime,
       last_synced_time_.ToInternalValue());
   profile_->GetPrefs()->ScheduleSavePersistentPrefs();
 }
 
 // An invariant has been violated.  Transition to an error state where we try
 // to do as little work as possible, to avoid further corruption or crashes.
 void ProfileSyncService::OnUnrecoverableError() {
   unrecoverable_error_detected_ = true;
   change_processor_->Stop();
-
-  if (SetupInProgress())
-    wizard_.Step(SyncSetupWizard::FATAL_ERROR);
+  
+  // Tell the wizard so it can inform the user only if it is already open.
+  wizard_.Step(SyncSetupWizard::FATAL_ERROR);
   FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
   LOG(ERROR) << "Unrecoverable error detected -- ProfileSyncService unusable.";
 }
 
 void ProfileSyncService::OnBackendInitialized() {
   backend_initialized_ = true;
   StartProcessingChangesIfReady();
 
   // The very first time the backend initializes is effectively the first time
   // we can say we successfully "synced".  last_synced_time_ will only be null
@@ skipping 103 matching lines @@
   last_attempted_user_email_ = username;
   is_auth_in_progress_ = true;
   FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
 
   auth_start_time_ = base::TimeTicks::Now();
   backend_->Authenticate(username, password);
 }
 
 void ProfileSyncService::OnUserAcceptedMergeAndSync() {
   base::TimeTicks start_time = base::TimeTicks::Now();
+  bool not_first_run = model_associator_->SyncModelHasUserCreatedNodes();
   bool merge_success = model_associator_->AssociateModels();
   UMA_HISTOGRAM_MEDIUM_TIMES("Sync.UserPerceivedBookmarkAssociation",
                              base::TimeTicks::Now() - start_time);
-
-  wizard_.Step(SyncSetupWizard::DONE);  // TODO(timsteele): error state?
   if (!merge_success) {
     LOG(ERROR) << "Model assocation failed.";
     OnUnrecoverableError();
     return;
   }
 
+  wizard_.Step(not_first_run ? SyncSetupWizard::DONE :
+               SyncSetupWizard::DONE_FIRST_TIME);
+
   change_processor_->Start(profile_->GetBookmarkModel(),
                            backend_->GetUserShareHandle());
   FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
 }
 
 void ProfileSyncService::OnUserCancelledDialog() {
   if (!profile_->GetPrefs()->GetBoolean(prefs::kSyncHasSetupCompleted)) {
     // A sync dialog was aborted before authentication or merge acceptance.
     // Rollback.
     DisableForUser();
@@ skipping 16 matching lines @@
 
   // Show the sync merge warning dialog if needed.
   if (MergeAndSyncAcceptanceNeeded()) {
     ProfileSyncService::SyncEvent(MERGE_AND_SYNC_NEEDED);
     wizard_.Step(SyncSetupWizard::MERGE_AND_SYNC);
     return;
   }
 
   // We're ready to merge the models.
   base::TimeTicks start_time = base::TimeTicks::Now();
+  bool not_first_run = model_associator_->SyncModelHasUserCreatedNodes();
   bool merge_success = model_associator_->AssociateModels();
   UMA_HISTOGRAM_TIMES("Sync.BookmarkAssociationTime",
                       base::TimeTicks::Now() - start_time);
+  if (!merge_success) {
+      LOG(ERROR) << "Model assocation failed.";
+      OnUnrecoverableError();
+      return;
+  }
 
-  wizard_.Step(SyncSetupWizard::DONE);  // TODO(timsteele): error state?
-  if (!merge_success) {
-    LOG(ERROR) << "Model assocation failed.";
-    OnUnrecoverableError();
-    return;
-  }
+  wizard_.Step(not_first_run ? SyncSetupWizard::DONE :
+               SyncSetupWizard::DONE_FIRST_TIME);
 
   change_processor_->Start(profile_->GetBookmarkModel(),
                            backend_->GetUserShareHandle());
   FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
 }
 
 void ProfileSyncService::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
@@ skipping 10 matching lines @@
 }
 
 bool ProfileSyncService::ShouldPushChanges() {
   // True only after all bootstrapping has succeeded: the bookmark model is
   // loaded, the sync backend is initialized, the two domains are
   // consistent with one another, and no unrecoverable error has transpired.
   return change_processor_->IsRunning();
 }
 
 #endif  // CHROME_PERSONALIZATION