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

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

Issue 10407105: Improve error messaging of webRequest API in case of conflicts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Attempt to fix windows compilation Created 8 years, 2 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 18a4fd560fc7968ca20484973201be2cd5060693..dcac717b8432ba477453a3c1617e06589f468509 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -351,7 +351,6 @@ ExtensionService::ExtensionService(Profile* profile,
update_once_all_providers_are_ready_(false),
app_sync_bundle_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
extension_sync_bundle_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
- extension_warnings_(profile),
app_shortcut_manager_(profile) {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -825,12 +824,6 @@ bool ExtensionService::UninstallExtension(
1, 2);
}
- // Uninstalling one extension might have solved the problems of others.
- // Therefore, we clear warnings of this type for all extensions.
- std::set<ExtensionWarningSet::WarningType> warnings;
- extension_warnings_.GetWarningsAffectingExtension(extension_id, &warnings);
- extension_warnings_.ClearWarnings(warnings);
-
return true;
}
@@ -928,12 +921,6 @@ void ExtensionService::DisableExtension(
}
SyncExtensionChangeIfNeeded(*extension);
-
- // Deactivating one extension might have solved the problems of others.
- // Therefore, we clear warnings of this type for all extensions.
- std::set<ExtensionWarningSet::WarningType> warnings;
- extension_warnings_.GetWarningsAffectingExtension(extension_id, &warnings);
- extension_warnings_.ClearWarnings(warnings);
}
void ExtensionService::GrantPermissionsAndEnableExtension(

Powered by Google App Engine
This is Rietveld 408576698