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

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

Issue 14066003: Don't allow elevation for CHROME_OS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bug in set_elevated function. Created 7 years, 8 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
« no previous file with comments | « chrome/browser/ui/webui/options/managed_user_passphrase_handler.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options/managed_user_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options/managed_user_settings_handler.cc b/chrome/browser/ui/webui/options/managed_user_settings_handler.cc
index df67916dfc2f0611e083234ae6ddf3ecf7440296..8d07789d97aff27d6ea588a1386fac41523d3088 100644
--- a/chrome/browser/ui/webui/options/managed_user_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/managed_user_settings_handler.cc
@@ -112,6 +112,7 @@ void ManagedUserSettingsHandler::InitializePage() {
return;
}
+#if !defined(OS_CHROMEOS)
PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
bool passphrase_empty =
pref_service->GetString(prefs::kManagedModeLocalPassphrase).empty();
@@ -119,6 +120,7 @@ void ManagedUserSettingsHandler::InitializePage() {
web_ui()->CallJavascriptFunction(
"ManagedUserSettings.passphraseChanged",
is_passphrase_set);
+#endif
// Populate the list.
UpdateViewFromModel();
@@ -136,7 +138,9 @@ void ManagedUserSettingsHandler::HandlePageOpened(const base::ListValue* args) {
// Check if we need to give initial elevation for startup of a new profile.
if (service->startup_elevation()) {
service->set_startup_elevation(false);
+#if !defined(OS_CHROMEOS)
observer->set_elevated(true);
+#endif
} else {
has_seen_settings_dialog_ = true;
}
« no previous file with comments | « chrome/browser/ui/webui/options/managed_user_passphrase_handler.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698