diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-03 17:38:10 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-03 17:38:10 +0000 |
| commit | 31c49e867d2fa554a8843d9509ea8d70b2d55cfb (patch) | |
| tree | 82e4e98d6c94b1d95aeaf271097a3b7071150c84 /chrome/browser/ui/webui/chromeos | |
| parent | 1dcedb54a7662431d7f58ba41f2f33f9dad22428 (diff) | |
| download | chromium_src-31c49e867d2fa554a8843d9509ea8d70b2d55cfb.zip chromium_src-31c49e867d2fa554a8843d9509ea8d70b2d55cfb.tar.gz chromium_src-31c49e867d2fa554a8843d9509ea8d70b2d55cfb.tar.bz2 | |
[ChromeOS] Update Gaia side pane per mock.
- Add text around the createAccount and guestSignin links per mock;
- Fix a problem and sign-in error bubble is off position when Gaia side pane is hidden;
BUG=chromium-os:19927
TEST=Verify fix for chromium-os:19927 and verify whitelist failure error bubble is on Gaia regardless of whether the side pane is visible or not.
Review URL: http://codereview.chromium.org/7779021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99565 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/chromeos')
| -rw-r--r-- | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index 3b68bb1..bc9b02b 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -161,9 +161,9 @@ void SigninScreenHandler::GetLocalizedStrings( localized_strings->SetString("offlineMessageBody", l10n_util::GetStringUTF16(IDS_LOGIN_OFFLINE_MESSAGE)); localized_strings->SetString("createAccount", - l10n_util::GetStringUTF16(IDS_CREATE_ACCOUNT_BUTTON)); + l10n_util::GetStringUTF16(IDS_CREATE_ACCOUNT_HTML)); localized_strings->SetString("guestSignin", - l10n_util::GetStringUTF16(IDS_BROWSE_WITHOUT_SIGNING_IN_BUTTON)); + l10n_util::GetStringUTF16(IDS_BROWSE_WITHOUT_SIGNING_IN_HTML)); localized_strings->SetString("removeUser", l10n_util::GetStringUTF16(IDS_LOGIN_REMOVE)); @@ -286,6 +286,7 @@ void SigninScreenHandler::ShowSigninScreenForCreds( DictionaryValue params; params.SetString("startUrl", kGaiaExtStartPage); params.SetString("email", email_); + email_.clear(); const std::string app_locale = g_browser_process->GetApplicationLocale(); if (!app_locale.empty()) @@ -295,7 +296,7 @@ void SigninScreenHandler::ShowSigninScreenForCreds( UserCrosSettingsProvider::cached_allow_new_user()); params.SetBoolean("guestSignin", UserCrosSettingsProvider::cached_allow_guest()); - email_.clear(); + // Test automation data: const CommandLine* command_line = CommandLine::ForCurrentProcess(); if (command_line->HasSwitch(switches::kAuthExtensionPath)) { |