Chromium Code Reviews| Index: chrome/browser/ui/webui/options/extension_settings_handler.cc |
| =================================================================== |
| --- chrome/browser/ui/webui/options/extension_settings_handler.cc (revision 125814) |
| +++ chrome/browser/ui/webui/options/extension_settings_handler.cc (working copy) |
| @@ -22,6 +22,7 @@ |
| #include "chrome/browser/extensions/extension_warning_set.h" |
| #include "chrome/browser/extensions/unpacked_installer.h" |
| #include "chrome/browser/google/google_util.h" |
| +#include "chrome/browser/managed_mode.h" |
| #include "chrome/browser/profiles/profile.h" |
| #include "chrome/browser/tab_contents/background_contents.h" |
| #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" |
| @@ -198,10 +199,16 @@ |
| } |
| results.Set("extensions", extensions_list); |
| - Profile* profile = Profile::FromWebUI(web_ui()); |
| - bool developer_mode = |
| - profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode); |
| - results.SetBoolean("developerMode", developer_mode); |
| + if (ManagedMode::IsInManagedMode()) { |
| + results.SetBoolean("managedMode", true); |
| + results.SetBoolean("developerMode", false); |
| + } else { |
| + results.SetBoolean("managedMode", false); |
| + Profile* profile = Profile::FromWebUI(web_ui()); |
| + bool developer_mode = |
| + profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode); |
| + results.SetBoolean("developerMode", developer_mode); |
| + } |
| web_ui()->CallJavascriptFunction("ExtensionSettings.returnExtensionsData", |
| results); |
| @@ -257,6 +264,8 @@ |
| void ExtensionSettingsHandler::HandleToggleDeveloperMode( |
| const ListValue* args) { |
| + if (ManagedMode::IsInManagedMode()) |
| + return; |
|
Evan Stade
2012/03/13 21:02:07
nit: \n
|
| Profile* profile = Profile::FromWebUI(web_ui()); |
| bool developer_mode = |
| profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode); |
| @@ -562,6 +571,8 @@ |
| l10n_util::GetStringUTF16(IDS_EXTENSIONS_ACTIVITY_LINK)); |
| localized_strings->SetString("extensionSettingsPolicyControlled", |
| l10n_util::GetStringUTF16(IDS_EXTENSIONS_POLICY_CONTROLLED)); |
| + localized_strings->SetString("extensionSettingsManagedMode", |
| + l10n_util::GetStringUTF16(IDS_EXTENSIONS_MANAGED_MODE)); |
| localized_strings->SetString("extensionSettingsShowButton", |
| l10n_util::GetStringUTF16(IDS_EXTENSIONS_SHOW_BUTTON)); |
| localized_strings->SetString("extensionSettingsLoadUnpackedButton", |
| @@ -675,6 +686,7 @@ |
| extension_data->SetBoolean("isUnpacked", |
| extension->location() == Extension::LOAD); |
| extension_data->SetBoolean("mayDisable", |
| + !ManagedMode::IsInManagedMode() && |
| Extension::UserMayDisable(extension->location())); |
| extension_data->SetBoolean("enabled", enabled); |
| extension_data->SetBoolean("terminated", terminated); |