Chromium Code Reviews| Index: chrome/browser/ui/webui/extensions/extension_settings_handler.cc |
| diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc |
| index 6d95c58abc747698e48be5c8d1198a9374eb92d0..fc8627a054cf8824c3ca57937f4d19a3b4baf6a6 100644 |
| --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc |
| +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc |
| @@ -691,18 +691,12 @@ void ExtensionSettingsHandler::RegisterMessages() { |
| web_ui()->RegisterMessageCallback("extensionSettingsLaunch", |
| base::Bind(&ExtensionSettingsHandler::HandleLaunchMessage, |
| AsWeakPtr())); |
| - web_ui()->RegisterMessageCallback("extensionSettingsReload", |
| - base::Bind(&ExtensionSettingsHandler::HandleReloadMessage, |
| - AsWeakPtr())); |
| web_ui()->RegisterMessageCallback("extensionSettingsRepair", |
| base::Bind(&ExtensionSettingsHandler::HandleRepairMessage, |
| AsWeakPtr())); |
| web_ui()->RegisterMessageCallback("extensionSettingsEnableErrorCollection", |
| base::Bind(&ExtensionSettingsHandler::HandleEnableErrorCollectionMessage, |
| AsWeakPtr())); |
| - web_ui()->RegisterMessageCallback("extensionSettingsAllowFileAccess", |
| - base::Bind(&ExtensionSettingsHandler::HandleAllowFileAccessMessage, |
| - AsWeakPtr())); |
| web_ui()->RegisterMessageCallback("extensionSettingsAllowOnAllUrls", |
| base::Bind(&ExtensionSettingsHandler::HandleAllowOnAllUrlsMessage, |
| AsWeakPtr())); |
| @@ -1044,13 +1038,6 @@ void ExtensionSettingsHandler::HandleLaunchMessage( |
| extensions::SOURCE_EXTENSIONS_PAGE)); |
| } |
| -void ExtensionSettingsHandler::HandleReloadMessage( |
| - const base::ListValue* args) { |
| - std::string extension_id = base::UTF16ToUTF8(ExtractStringValue(args)); |
| - CHECK(!extension_id.empty()); |
| - extension_service_->ReloadExtensionWithQuietFailure(extension_id); |
| -} |
| - |
| void ExtensionSettingsHandler::HandleRepairMessage( |
| const base::ListValue* args) { |
| std::string extension_id = base::UTF16ToUTF8(ExtractStringValue(args)); |
| @@ -1075,31 +1062,6 @@ void ExtensionSettingsHandler::HandleEnableErrorCollectionMessage( |
| ->SetReportingAllForExtension(extension_id, enabled); |
| } |
| -void ExtensionSettingsHandler::HandleAllowFileAccessMessage( |
| - const base::ListValue* args) { |
| - CHECK_EQ(2U, args->GetSize()); |
| - std::string extension_id, allow_str; |
| - CHECK(args->GetString(0, &extension_id)); |
| - CHECK(args->GetString(1, &allow_str)); |
| - const Extension* extension = |
| - extension_service_->GetInstalledExtension(extension_id); |
| - if (!extension) |
| - return; |
| - |
| - if (util::IsExtensionSupervised(extension, Profile::FromWebUI(web_ui()))) |
|
not at google - send to devlin
2015/02/26 00:56:48
Looks like you lost this check in the move to the
Devlin
2015/02/26 01:14:03
I didn't miss it; it wasn't there when I moved it!
|
| - return; |
| - |
| - if (!management_policy_->UserMayModifySettings(extension, NULL)) { |
| - LOG(ERROR) << "An attempt was made to change allow file access of an" |
| - << " extension that is non-usermanagable. Extension id : " |
| - << extension->id(); |
| - return; |
| - } |
| - |
| - util::SetAllowFileAccess( |
| - extension_id, extension_service_->profile(), allow_str == "true"); |
| -} |
| - |
| void ExtensionSettingsHandler::HandleAllowOnAllUrlsMessage( |
| const base::ListValue* args) { |
| DCHECK(FeatureSwitch::scripts_require_action()->IsEnabled()); |