| 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 5fbee8fbb2dafe5f6a1e9cfd993dd84588663dc7..28e69346462d3e62a665eed303bbe9a69c7a7fbf 100644
|
| --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
|
| +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
|
| @@ -843,10 +843,12 @@ void ExtensionSettingsHandler::HandleEnableMessage(
|
|
|
| const Extension* extension =
|
| extension_service_->GetInstalledExtension(extension_id);
|
| - if (!extension ||
|
| - !management_policy_->UserMayModifySettings(extension, NULL)) {
|
| - LOG(ERROR) << "Attempt to enable an extension that is non-usermanagable was"
|
| - << "made. Extension id: " << extension->id();
|
| + if (!extension)
|
| + return;
|
| +
|
| + if (!management_policy_->UserMayModifySettings(extension, NULL)) {
|
| + LOG(ERROR) << "An attempt was made to enable an extension that is "
|
| + << "non-usermanagable. Extension id: " << extension->id();
|
| return;
|
| }
|
|
|
| @@ -917,8 +919,8 @@ void ExtensionSettingsHandler::HandleAllowFileAccessMessage(
|
| return;
|
|
|
| if (!management_policy_->UserMayModifySettings(extension, NULL)) {
|
| - LOG(ERROR) << "Attempt to change allow file access of an extension that is "
|
| - << "non-usermanagable was made. Extension id : "
|
| + LOG(ERROR) << "An attempt was made to change allow file access of an"
|
| + << " extension that is non-usermanagable. Extension id : "
|
| << extension->id();
|
| return;
|
| }
|
| @@ -938,8 +940,8 @@ void ExtensionSettingsHandler::HandleUninstallMessage(
|
| return;
|
|
|
| if (!management_policy_->UserMayModifySettings(extension, NULL)) {
|
| - LOG(ERROR) << "Attempt to uninstall an extension that is non-usermanagable "
|
| - << "was made. Extension id : " << extension->id();
|
| + LOG(ERROR) << "An attempt was made to uninstall an extension that is "
|
| + << "non-usermanagable. Extension id : " << extension->id();
|
| return;
|
| }
|
|
|
|
|