commit c6f3deaa386fc63b64932cd296311f74a3c299db
author bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Jan 14 02:23:11 2012
committer bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Jan 14 02:23:11 2012
tree 15dd4243cf6a6953b1f7572dd7886f383577a607
parent 552c0a8a5e77a8f84a54f20b10d4d0c6c5155a6c

Keep "internal" and "extra" plugins in the same list.

This allows us to decide for every bundled plug-in whether it should override others.


BUG=110152
TEST=Flapper is loaded after NPAPI Flash.


Review URL: http://codereview.chromium.org/9204005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117763 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/extensions/extension_service.cc

diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index c69cd61..0c42e676 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -2583,7 +2583,7 @@
       }
 
       PluginService::GetInstance()->RefreshPlugins();
-      PluginService::GetInstance()->RegisterInternalPlugin(info);
+      PluginService::GetInstance()->RegisterInternalPlugin(info, true);
       // This plugin has been modified, no need to check the rest of its
       // types, but continue checking other plugins.
       break;