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

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

Issue 8789018: Revert 113047 - Make ExtensionService use ExtensionSet. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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/unpacked_installer.cc
===================================================================
--- chrome/browser/extensions/unpacked_installer.cc (revision 113069)
+++ chrome/browser/extensions/unpacked_installer.cc (working copy)
@@ -194,12 +194,15 @@
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
if (!service_weak_.get())
return;
- const ExtensionSet* disabled_extensions =
+ const ExtensionList* disabled_extensions =
service_weak_->disabled_extensions();
if (service_weak_->show_extensions_prompts() &&
prompt_for_plugins_ &&
!extension->plugins().empty() &&
- disabled_extensions->Contains(extension->id())) {
+ std::find(disabled_extensions->begin(),
+ disabled_extensions->end(),
+ extension) !=
+ disabled_extensions->end()) {
SimpleExtensionLoadPrompt* prompt = new SimpleExtensionLoadPrompt(
service_weak_->profile(),
service_weak_,
Property changes on: chrome/browser/extensions/unpacked_installer.cc
___________________________________________________________________
Added: svn:mergeinfo
« no previous file with comments | « chrome/browser/extensions/test_extension_service.cc ('k') | chrome/browser/extensions/user_script_listener.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698