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

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more alphabetize (and rebase again) 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/options/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "apps/app_window.h" 10 #include "apps/app_window.h"
(...skipping 883 matching lines...) Expand 10 before | Expand all | Expand 10 after
894 SetupManagingSupervisedUsers(); 894 SetupManagingSupervisedUsers();
895 SetupEasyUnlock(); 895 SetupEasyUnlock();
896 SetupExtensionControlledIndicators(); 896 SetupExtensionControlledIndicators();
897 897
898 #if defined(OS_CHROMEOS) 898 #if defined(OS_CHROMEOS)
899 SetupAccessibilityFeatures(); 899 SetupAccessibilityFeatures();
900 policy::BrowserPolicyConnectorChromeOS* connector = 900 policy::BrowserPolicyConnectorChromeOS* connector =
901 g_browser_process->platform_part()->browser_policy_connector_chromeos(); 901 g_browser_process->platform_part()->browser_policy_connector_chromeos();
902 if (!connector->IsEnterpriseManaged() && 902 if (!connector->IsEnterpriseManaged() &&
903 !chromeos::UserManager::Get()->IsLoggedInAsGuest() && 903 !chromeos::UserManager::Get()->IsLoggedInAsGuest() &&
904 !chromeos::UserManager::Get()->IsLoggedInAsLocallyManagedUser()) { 904 !chromeos::UserManager::Get()->IsLoggedInAsSupervisedUser()) {
905 web_ui()->CallJavascriptFunction( 905 web_ui()->CallJavascriptFunction(
906 "BrowserOptions.enableFactoryResetSection"); 906 "BrowserOptions.enableFactoryResetSection");
907 } 907 }
908 908
909 Profile* profile = Profile::FromWebUI(web_ui()); 909 Profile* profile = Profile::FromWebUI(web_ui());
910 OnAccountPictureManagedChanged( 910 OnAccountPictureManagedChanged(
911 policy::ProfilePolicyConnectorFactory::GetForProfile(profile)-> 911 policy::ProfilePolicyConnectorFactory::GetForProfile(profile)->
912 policy_service()->GetPolicies( 912 policy_service()->GetPolicies(
913 policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME, 913 policy::PolicyNamespace(policy::POLICY_DOMAIN_CHROME,
914 std::string())) 914 std::string()))
(...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after
1804 extension = extensions::GetExtensionOverridingProxy( 1804 extension = extensions::GetExtensionOverridingProxy(
1805 Profile::FromWebUI(web_ui())); 1805 Profile::FromWebUI(web_ui()));
1806 AppendExtensionData("proxy", extension, &extension_controlled); 1806 AppendExtensionData("proxy", extension, &extension_controlled);
1807 1807
1808 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", 1808 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
1809 extension_controlled); 1809 extension_controlled);
1810 #endif // defined(OS_WIN) 1810 #endif // defined(OS_WIN)
1811 } 1811 }
1812 1812
1813 } // namespace options 1813 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/ui_account_tweaks.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698