mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-01-26 17:25:29 +01:00
51181e1004
- Reorganization of BrowserWebViewDelegate due to WebViewDelegate being separated into different interfaces. - icu38 renamed to icu with related project and namespace changes. - New implementation of BrowserAppCacheSystem that integrates with BrowserResourceLoaderBridge. - New webkit_glue_plugins.patch for RegisterInternalPlugin() issue 173107. Manually reverting the webkit/glue/plugins directory may be necessary before building. git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@42 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
Index: plugin_list.cc
|
|
===================================================================
|
|
--- plugin_list.cc (revision 26359)
|
|
+++ plugin_list.cc (working copy)
|
|
@@ -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 @@
|
|
|
|
extra_plugin_paths = extra_plugin_paths_;
|
|
extra_plugin_dirs = extra_plugin_dirs_;
|
|
+ internal_plugins = internal_plugins_;
|
|
}
|
|
|
|
base::TimeTicks start_time = base::TimeTicks::Now();
|
|
@@ -157,6 +159,14 @@
|
|
std::vector<FilePath> directories_to_scan;
|
|
GetPluginDirectories(&directories_to_scan);
|
|
|
|
+ for (size_t i = 0; i < internal_plugins.size(); ++i) {
|
|
+#if defined(OS_WIN)
|
|
+ if (internal_plugins[i].path.value() == kDefaultPluginLibraryName)
|
|
+ continue;
|
|
+#endif
|
|
+ LoadPlugin(internal_plugins[i].path, &new_plugins);
|
|
+ }
|
|
+
|
|
for (size_t i = 0; i < extra_plugin_paths.size(); ++i)
|
|
LoadPlugin(extra_plugin_paths[i], &new_plugins);
|
|
|