summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-03 00:03:13 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-03 00:03:13 +0000
commit7a0a5695b7aebd4606f079a9161ddb8dd71928e1 (patch)
tree163396543cb38ff937df2f98174295686ac345ac
parent474bb2131c8bd9109fa33d034e3fa95da0eba228 (diff)
downloadchromium_src-7a0a5695b7aebd4606f079a9161ddb8dd71928e1.zip
chromium_src-7a0a5695b7aebd4606f079a9161ddb8dd71928e1.tar.gz
chromium_src-7a0a5695b7aebd4606f079a9161ddb8dd71928e1.tar.bz2
Merge 120253 - Fix blank sign in button
When signing in the "Sign in" button would temporarily become blank. The problem was that we were changing the button's label to "loginSuccess" which wasn't defined. This string was accidentally deleted in r83639. Fix was to re-add it. BUG=112047 TEST= Review URL: https://chromiumcodereview.appspot.com/9309068 TBR=sail@chromium.org Review URL: https://chromiumcodereview.appspot.com/9307077 git-svn-id: svn://svn.chromium.org/chrome/branches/1025/src@120254 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/webui/sync_setup_handler.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc
index 7c6a687..5b4a9a6 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler.cc
@@ -272,6 +272,7 @@ void SyncSetupHandler::GetStaticLocalizedValues(
{ "unrecoverableErrorHelpURL", IDS_SYNC_UNRECOVERABLE_ERROR_HELP_URL },
{ "cannotAccessAccount", IDS_SYNC_CANNOT_ACCESS_ACCOUNT },
{ "cancel", IDS_CANCEL },
+ { "loginSuccess", IDS_SYNC_SUCCESS },
{ "settingUp", IDS_SYNC_LOGIN_SETTING_UP },
{ "errorSigningIn", IDS_SYNC_ERROR_SIGNING_IN },
{ "signinHeader", IDS_SYNC_PROMO_SIGNIN_HEADER},