Green Tree Tactical Force: Revert skrul's bad commits (probably a git-cl bug).

chrome/browser/sync/profile_sync_service.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_
 
 #include <string>
 #include <map>
 
@@ skipping 157 matching lines @@
   const GoogleServiceAuthError& GetAuthError() const {
     return last_auth_error_;
   }
 
   // Displays a dialog for the user to enter GAIA credentials and attempt
   // re-authentication, and returns true if it actually opened the dialog.
   // Returns false if a dialog is already showing, an auth attempt is in
   // progress, the sync system is already authenticated, or some error
   // occurred preventing the action. We make it the duty of ProfileSyncService
   // to open the dialog to easily ensure only one is ever showing.
-  bool SetupInProgress() const;
+  bool SetupInProgress() const {
+    return !HasSyncSetupCompleted() &&
+        (WizardIsVisible() || bootstrap_sync_authentication_);
+  }
   bool WizardIsVisible() const {
     return wizard_.IsVisible();
   }
   void ShowLoginDialog(gfx::NativeWindow parent_window);
 
   void ShowChooseDataTypes(gfx::NativeWindow parent_window);
 
   // Pretty-printed strings for a given StatusSummary.
   static std::wstring BuildSyncStatusSummaryText(
       const browser_sync::SyncBackendHost::StatusSummary& summary);
@@ skipping 251 matching lines @@
 
   // This allows us to gracefully handle an ABORTED return code from the
   // DataTypeManager in the event that the server informed us to cease and
   // desist syncing immediately.
   bool expect_sync_configuration_aborted_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_