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

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

Issue 22145004: Profile Reset: Don't disable defaults apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Grammar Created 7 years, 4 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/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 6035d7ce3547d5582786f8ecae52913a1c783bc8..275daa81eb00f9a3f7ecdd5d9a51e803fcd04505 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -993,6 +993,10 @@ void ExtensionService::DisableUserExtensions(
for (extensions::ExtensionList::const_iterator extension = to_disable.begin();
extension != to_disable.end(); ++extension) {
+ if ((*extension)->was_installed_by_default() &&
+ extension_urls::IsWebstoreUpdateUrl(
+ extensions::ManifestURL::GetUpdateURL(*extension)))
+ 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_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698