Show proper title for spinner dialog.

chrome/browser/ui/webui/sync_setup_handler.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/webui/sync_setup_handler.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 266 matching lines @@
       create_account + UTF8ToUTF16("</a>");
   localized_strings->SetString("createAccountLinkHTML",
       GetStringFUTF16(IDS_SYNC_CREATE_ACCOUNT_PREFIX, create_account));
 
   string16 sync_benefits_url(
       UTF8ToUTF16(google_util::StringAppendGoogleLocaleParam(
           chrome::kSyncLearnMoreURL)));
   localized_strings->SetString("promoLearnMoreURL", sync_benefits_url);
 
   static OptionsStringResource resources[] = {
     { "syncSetupConfigureTitle", IDS_SYNC_SETUP_CONFIGURE_TITLE },

[Nicolas Zea, 2012/09/11 12:58:30]

is this still used or can it be removed?

[kochi, 2012/09/11 13:40:12]

This is still used for the "Advanced sync configuration" dialog.

+    { "syncSetupSpinnerTitle", IDS_SYNC_SETUP_SPINNER_TITLE },
     { "syncSetupTimeoutTitle", IDS_SYNC_SETUP_TIME_OUT_TITLE },
     { "syncSetupTimeoutContent", IDS_SYNC_SETUP_TIME_OUT_CONTENT },
     { "cannotBeBlank", IDS_SYNC_CANNOT_BE_BLANK },
     { "emailLabel", IDS_SYNC_LOGIN_EMAIL_NEW_LINE },
     { "passwordLabel", IDS_SYNC_LOGIN_PASSWORD_NEW_LINE },
     { "invalidCredentials", IDS_SYNC_INVALID_USER_CREDENTIALS },
     { "signin", IDS_SYNC_SIGNIN },
     { "couldNotConnect", IDS_SYNC_LOGIN_COULD_NOT_CONNECT },
     { "unrecoverableError", IDS_SYNC_UNRECOVERABLE_ERROR },
     { "errorLearnMore", IDS_LEARN_MORE },
@@ skipping 285 matching lines @@
     return false;
   }
 
   // Notify services that login UI is now active.
   GetLoginUIService()->SetLoginUI(this);
   service->SetSetupInProgress(true);
 
   return true;
 }
 
-// TODO(kochi): Handle error conditions (timeout, other failures).
-// http://crbug.com/128692
 void SyncSetupHandler::DisplaySpinner() {
   configuring_sync_ = true;
   StringValue page("spinner");
   DictionaryValue args;
 
   const int kTimeoutSec = 30;
   DCHECK(!backend_start_timer_.get());
   backend_start_timer_.reset(new base::OneShotTimer<SyncSetupHandler>());
   backend_start_timer_->Start(FROM_HERE,
                               base::TimeDelta::FromSeconds(kTimeoutSec),
@@ skipping 483 matching lines @@
     if (i != current_profile_index && AreUserNamesEqual(
         cache.GetUserNameOfProfileAtIndex(i), username_utf16)) {
       *error_message = l10n_util::GetStringUTF16(
           IDS_SYNC_USER_NAME_IN_USE_ERROR);
       return false;
     }
   }
 
   return true;
 }