sync: temp fix for ShowErrorUI

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2011 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/sync/profile_sync_service.h"
 
 #include <stddef.h>
 #include <map>
 #include <ostream>
 #include <set>
@@ skipping 794 matching lines @@
 
   NotifyObservers();
 }
 
 void ProfileSyncService::ShowErrorUI() {
   if (WizardIsVisible()) {
     wizard_.Focus();
     return;
   }
 
-  ShowSyncSetup(SyncSetupWizard::NONFATAL_ERROR);
+  if (last_auth_error_.state() != AuthError::NONE)

[binji, 2011/08/11 18:15:39]

Will this branch be taken if there is a passphrase error?

[tim (not reviewing), 2011/08/11 18:18:35]

Only if there is also an authentication error, in which case I think it's okay
to show the auth error first.

+    ShowLoginDialog();
+  else
+    ShowSyncSetup(SyncSetupWizard::NONFATAL_ERROR);
 }
 
 void ProfileSyncService::ShowConfigure(bool sync_everything) {
   if (WizardIsVisible()) {
     wizard_.Focus();
     return;
   }
 
   if (sync_everything)
     ShowSyncSetup(SyncSetupWizard::SYNC_EVERYTHING);
@@ skipping 577 matching lines @@
   // is initialized, all enabled data types are consistent with one
   // another, and no unrecoverable error has transpired.
   if (unrecoverable_error_detected_)
     return false;
 
   if (!data_type_manager_.get())
     return false;
 
   return data_type_manager_->state() == DataTypeManager::CONFIGURED;
 }