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

Unified Diff: chrome/browser/ui/webui/flags_ui.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/flags_ui.cc
diff --git a/chrome/browser/ui/webui/flags_ui.cc b/chrome/browser/ui/webui/flags_ui.cc
index 64fe3d9cc3663b2ed63bbfbb4197ead8ffe8f678..a43c6921bc535824650a3f12cbff48166a3b099b 100644
--- a/chrome/browser/ui/webui/flags_ui.cc
+++ b/chrome/browser/ui/webui/flags_ui.cc
@@ -75,7 +75,7 @@ content::WebUIDataSource* CreateFlagsUIHTMLSource() {
source->AddLocalizedString("enable", IDS_FLAGS_ENABLE);
#if defined(OS_CHROMEOS)
- if (!chromeos::UserManager::Get()->IsCurrentUserOwner() &&
+ if (!chromeos::GetUserManager()->IsCurrentUserOwner() &&
base::SysInfo::IsRunningOnChromeOS()) {
// Set the strings to show which user can actually change the flags.
std::string owner;
@@ -231,9 +231,10 @@ void FlagsDOMHandler::HandleRestartBrowser(const base::ListValue* args) {
// argv[0] is the program name |CommandLine::NO_PROGRAM|.
flags.assign(user_flags.argv().begin() + 1, user_flags.argv().end());
VLOG(1) << "Restarting to apply per-session flags...";
- chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
- SetFlagsForUser(chromeos::UserManager::Get()->GetActiveUser()->email(),
- flags);
+ chromeos::DBusThreadManager::Get()
+ ->GetSessionManagerClient()
+ ->SetFlagsForUser(chromeos::GetUserManager()->GetActiveUser()->email(),
+ flags);
#endif
chrome::AttemptRestart();
}
« no previous file with comments | « chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc ('k') | chrome/browser/ui/webui/help/help_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698