| Index: chrome/browser/ui/webui/help/help_handler.cc
|
| diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc
|
| index 6c7b8ae59c94f8ff0fd0a0d3e110c95b964af0b6..3963634071aef68f759bd6c8638e2687bbac84d4 100644
|
| --- a/chrome/browser/ui/webui/help/help_handler.cc
|
| +++ b/chrome/browser/ui/webui/help/help_handler.cc
|
| @@ -119,14 +119,14 @@ bool CanChangeChannel() {
|
| return false;
|
| // Get the currently logged in user and strip the domain part only.
|
| std::string domain = "";
|
| - std::string user = chromeos::UserManager::Get()->GetLoggedInUser()->email();
|
| + std::string user = chromeos::GetUserManager()->GetLoggedInUser()->email();
|
| size_t at_pos = user.find('@');
|
| if (at_pos != std::string::npos && at_pos + 1 < user.length())
|
| domain = user.substr(user.find('@') + 1);
|
| policy::BrowserPolicyConnectorChromeOS* connector =
|
| g_browser_process->platform_part()->browser_policy_connector_chromeos();
|
| return domain == connector->GetEnterpriseDomain();
|
| - } else if (chromeos::UserManager::Get()->IsCurrentUserOwner()) {
|
| + } else if (chromeos::GetUserManager()->IsCurrentUserOwner()) {
|
| // On non managed machines we have local owner who is the only one to change
|
| // anything. Ensure that ReleaseChannelDelegated is false.
|
| return !value;
|
| @@ -431,7 +431,7 @@ void HelpHandler::SetChannel(const base::ListValue* args) {
|
|
|
| version_updater_->SetChannel(base::UTF16ToUTF8(channel),
|
| is_powerwash_allowed);
|
| - if (chromeos::UserManager::Get()->IsCurrentUserOwner()) {
|
| + if (chromeos::GetUserManager()->IsCurrentUserOwner()) {
|
| // Check for update after switching release channel.
|
| version_updater_->CheckForUpdate(base::Bind(&HelpHandler::SetUpdateStatus,
|
| base::Unretained(this)));
|
|
|