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

Unified Diff: chrome/browser/extensions/extension_service.cc

Issue 21779002: Don't disable packaged / hosted Apps on profile_reset (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nit Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_service.h ('k') | chrome/browser/profile_resetter/profile_resetter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 42cb3fa69ea9ea451229871e5df976d830fb9cd7..28cdc80addfdf4efbc7f5fecda90640361862e93 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -977,6 +977,7 @@ void ExtensionService::DisableExtension(
}
void ExtensionService::DisableUserExtensions(
+ const std::set<extensions::Manifest::Type>& type_filter,
const std::vector<std::string>& except_ids) {
extensions::ManagementPolicy* management_policy =
system_->management_policy();
@@ -995,6 +996,8 @@ void ExtensionService::DisableUserExtensions(
for (extensions::ExtensionList::const_iterator extension = to_disable.begin();
extension != to_disable.end(); ++extension) {
+ if (type_filter.end() == type_filter.find((*extension)->GetType()))
asargent_no_longer_on_chrome 2013/08/02 20:02:43 style nit: I personally would prefer to put the fi
+ continue;
const std::string& id = (*extension)->id();
if (except_ids.end() == std::find(except_ids.begin(), except_ids.end(), id))
DisableExtension(id, extensions::Extension::DISABLE_USER_ACTION);
« no previous file with comments | « chrome/browser/extensions/extension_service.h ('k') | chrome/browser/profile_resetter/profile_resetter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698