| 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();
|
| }
|
|
|