2009-08-20 17:53:30 +00:00
|
|
|
Index: plugin_list.cc
|
|
|
|
===================================================================
|
2009-09-17 16:56:32 +00:00
|
|
|
--- plugin_list.cc (revision 26359)
|
2009-08-20 17:53:30 +00:00
|
|
|
+++ plugin_list.cc (working copy)
|
2009-09-17 16:56:32 +00:00
|
|
|
@@ -141,6 +141,7 @@
|
|
|
|
// other methods if they're called on other threads.
|
|
|
|
std::vector<FilePath> extra_plugin_paths;
|
|
|
|
std::vector<FilePath> extra_plugin_dirs;
|
|
|
|
+ std::vector<PluginVersionInfo> internal_plugins;
|
|
|
|
{
|
|
|
|
AutoLock lock(lock_);
|
|
|
|
if (plugins_loaded_ && !refresh)
|
|
|
|
@@ -148,6 +149,7 @@
|
2009-08-20 17:53:30 +00:00
|
|
|
|
2009-09-17 16:56:32 +00:00
|
|
|
extra_plugin_paths = extra_plugin_paths_;
|
|
|
|
extra_plugin_dirs = extra_plugin_dirs_;
|
|
|
|
+ internal_plugins = internal_plugins_;
|
|
|
|
}
|
2009-08-20 17:53:30 +00:00
|
|
|
|
2009-09-17 16:56:32 +00:00
|
|
|
base::TimeTicks start_time = base::TimeTicks::Now();
|
|
|
|
@@ -157,6 +159,14 @@
|
|
|
|
std::vector<FilePath> directories_to_scan;
|
|
|
|
GetPluginDirectories(&directories_to_scan);
|
2009-08-20 17:53:30 +00:00
|
|
|
|
2009-09-17 16:56:32 +00:00
|
|
|
+ for (size_t i = 0; i < internal_plugins.size(); ++i) {
|
|
|
|
+#if defined(OS_WIN)
|
|
|
|
+ if (internal_plugins[i].path.value() == kDefaultPluginLibraryName)
|
2009-08-20 17:53:30 +00:00
|
|
|
+ continue;
|
2009-09-17 16:56:32 +00:00
|
|
|
+#endif
|
|
|
|
+ LoadPlugin(internal_plugins[i].path, &new_plugins);
|
2009-08-20 17:53:30 +00:00
|
|
|
+ }
|
2009-09-17 16:56:32 +00:00
|
|
|
+
|
|
|
|
for (size_t i = 0; i < extra_plugin_paths.size(); ++i)
|
|
|
|
LoadPlugin(extra_plugin_paths[i], &new_plugins);
|
2009-08-20 17:53:30 +00:00
|
|
|
|