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

Unified Diff: chrome/browser/ui/views/ash/app_list/extension_app_item.cc

Issue 10382149: Refactor the various ways to control what users can do to extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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
Index: chrome/browser/ui/views/ash/app_list/extension_app_item.cc
===================================================================
--- chrome/browser/ui/views/ash/app_list/extension_app_item.cc (revision 140193)
+++ chrome/browser/ui/views/ash/app_list/extension_app_item.cc (working copy)
@@ -7,7 +7,9 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/extensions/extension_prefs.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/extension_uninstall_dialog.h"
+#include "chrome/browser/extensions/management_policy.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
@@ -222,7 +224,10 @@
!extension->options_url().is_empty();
} else if (command_id == UNINSTALL) {
const Extension* extension = GetExtension();
- return extension && Extension::UserMayDisable(extension->location());
+ const extensions::ManagementPolicy* policy = ExtensionSystem::Get(
+ profile_)->management_policy();
+ return extension &&
+ policy->UserMayModifySettings(extension, NULL);
}
return true;
}
« no previous file with comments | « chrome/browser/resources/extensions/extension_list.js ('k') | chrome/browser/ui/webui/extensions/extension_settings_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698