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

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

Issue 375413002: Replace chromeos::UserManager::Get() with chromeos::GetUserManager(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 6 years, 5 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
Index: chrome/browser/ui/webui/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 5edd8cbc88e83bfb0807b64a5dfbb8bfd86cfbec..f7f981079a740c18744103696fa73ba8b4ae216c 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -896,8 +896,8 @@ void BrowserOptionsHandler::InitializePage() {
policy::BrowserPolicyConnectorChromeOS* connector =
g_browser_process->platform_part()->browser_policy_connector_chromeos();
if (!connector->IsEnterpriseManaged() &&
- !chromeos::UserManager::Get()->IsLoggedInAsGuest() &&
- !chromeos::UserManager::Get()->IsLoggedInAsLocallyManagedUser()) {
+ !chromeos::GetUserManager()->IsLoggedInAsGuest() &&
+ !chromeos::GetUserManager()->IsLoggedInAsLocallyManagedUser()) {
web_ui()->CallJavascriptFunction(
"BrowserOptions.enableFactoryResetSection");
}
@@ -912,7 +912,7 @@ void BrowserOptionsHandler::InitializePage() {
OnWallpaperManagedChanged(
chromeos::WallpaperManager::Get()->IsPolicyControlled(
- chromeos::UserManager::Get()->GetActiveUser()->email()));
+ chromeos::GetUserManager()->GetActiveUser()->email()));
#endif
}
@@ -1304,7 +1304,7 @@ void BrowserOptionsHandler::ThemesSetNative(const base::ListValue* args) {
#if defined(OS_CHROMEOS)
void BrowserOptionsHandler::UpdateAccountPicture() {
- std::string email = chromeos::UserManager::Get()->GetLoggedInUser()->email();
+ std::string email = chromeos::GetUserManager()->GetLoggedInUser()->email();
if (!email.empty()) {
web_ui()->CallJavascriptFunction("BrowserOptions.updateAccountPicture");
base::StringValue email_value(email);

Powered by Google App Engine
This is Rietveld 408576698