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

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

Issue 144983002: Fixed chrome://settings/accounts availability for MP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed proxy_settings_ui. Created 6 years, 11 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/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 4535febeb19056285f834372aae6a8bf34ca3007..0dc8c6110dae4579fa14b1cd66cacbc7b63baf8f 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
@@ -155,7 +155,7 @@ base::Value* CoreChromeOSOptionsHandler::FetchPref(
if (connector->IsEnterpriseManaged())
dict->SetString("controlledBy", "policy");
bool disabled_by_owner = IsSettingOwnerOnly(pref_name) &&
- !UserManager::Get()->IsCurrentUserOwner();
+ !ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
dict->SetBoolean("disabled", disabled_by_owner);
if (disabled_by_owner)
dict->SetString("controlledBy", "owner");
@@ -214,7 +214,8 @@ void CoreChromeOSOptionsHandler::GetLocalizedValues(
DCHECK(localized_strings);
CoreOptionsHandler::GetLocalizedValues(localized_strings);
- AddAccountUITweaksLocalizedValues(localized_strings);
+ AddAccountUITweaksLocalizedValues(localized_strings,
+ Profile::FromWebUI(web_ui()));
localized_strings->SetString("controlledSettingOwner",
l10n_util::GetStringUTF16(IDS_OPTIONS_CONTROLLED_SETTING_OWNER));
}
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc ('k') | chrome/browser/ui/webui/plugins_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698