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

Unified Diff: chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

Issue 2471993002: Remove calls to User::email() from chrome/browser/ui/webui/* (Closed)
Patch Set: Created 4 years, 1 month 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
Index: chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
index 201aa11c905c6671d19598cdc43986e11e22e1e8..a6a755365cc4caf9c9678fcc844f8de72d865cf5 100644
--- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
@@ -114,7 +114,8 @@ bool IsSecondaryUser(Profile* profile) {
user_manager::UserManager* user_manager = user_manager::UserManager::Get();
const user_manager::User* user =
ProfileHelper::Get()->GetUserByProfile(profile);
- return user && user->email() != user_manager->GetPrimaryUser()->email();
+ return user &&
+ user->GetAccountId() != user_manager->GetPrimaryUser()->GetAccountId();
}
const char kSelectNetworkMessage[] = "selectNetwork";
@@ -333,7 +334,8 @@ void CoreChromeOSOptionsHandler::GetLocalizedValues(
user_manager::UserManager* user_manager = user_manager::UserManager::Get();
if (IsSecondaryUser(profile)) {
- const std::string& primary_email = user_manager->GetPrimaryUser()->email();
+ const std::string& primary_email =
+ user_manager->GetPrimaryUser()->GetAccountId().GetUserEmail();
// Set secondaryUser to show the shared icon by the network section header.
localized_strings->SetBoolean("secondaryUser", true);

Powered by Google App Engine
This is Rietveld 408576698