diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 23:07:59 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 23:07:59 +0000 |
| commit | 653c51ee957c99184af0d8a8bc721b7c48531f51 (patch) | |
| tree | 29d7667ee50b5682b6643cc142d8115d11c87b92 | |
| parent | 3dd3f2981096399afc77efb00a76999fb7fd101f (diff) | |
| download | chromium_src-653c51ee957c99184af0d8a8bc721b7c48531f51.zip chromium_src-653c51ee957c99184af0d8a8bc721b7c48531f51.tar.gz chromium_src-653c51ee957c99184af0d8a8bc721b7c48531f51.tar.bz2 | |
Chromeos: Only set email text if there is a logged in user
35 tests fail because we are setting the localized text for the string userEmail to the logged in email for a user, but in the test environment there is no logged in user.
BUG=105049
TEST=Various browser tests, including DownloadTest.ChromeURLAfterDownload
Review URL: http://codereview.chromium.org/8624004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111026 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/webui/options/personal_options_handler.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/options/personal_options_handler.cc b/chrome/browser/ui/webui/options/personal_options_handler.cc index 10fcf2a..da13c1b 100644 --- a/chrome/browser/ui/webui/options/personal_options_handler.cc +++ b/chrome/browser/ui/webui/options/personal_options_handler.cc @@ -202,8 +202,10 @@ void PersonalOptionsHandler::GetLocalizedValues( l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX)); localized_strings->SetString("changePicture", l10n_util::GetStringUTF16(IDS_OPTIONS_CHANGE_PICTURE)); - localized_strings->SetString("userEmail", - chromeos::UserManager::Get()->logged_in_user().email()); + if (chromeos::UserManager::Get()->user_is_logged_in()) { + localized_strings->SetString("userEmail", + chromeos::UserManager::Get()->logged_in_user().email()); + } #endif } |