Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4597)

Unified Diff: chrome/browser/ui/webui/options2/browser_options_handler.cc

Issue 10831204: Fix for number of ChromeOS browser_tests that were failing in BVTs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | content/test/browser_test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options2/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options2/browser_options_handler.cc b/chrome/browser/ui/webui/options2/browser_options_handler.cc
index 5dc5be28191f767fa0e13b5b4043dd07e5f97b1c..84e11d5793af299ce871c1750c7d0e0112afb309 100644
--- a/chrome/browser/ui/webui/options2/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options2/browser_options_handler.cc
@@ -362,10 +362,10 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
#if defined(OS_CHROMEOS)
- if (chromeos::UserManager::Get()->IsUserLoggedIn()) {
values->SetString("username",
- chromeos::UserManager::Get()->GetLoggedInUser().email());
- }
+ chromeos::UserManager::Get()->IsUserLoggedIn() ?
+ chromeos::UserManager::Get()->GetLoggedInUser().email() :
+ std::string());
#endif
// Pass along sync status early so it will be available during page init.
« no previous file with comments | « chrome/browser/chromeos/preferences.cc ('k') | content/test/browser_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698