diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 01:25:09 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-17 01:25:09 +0000 |
| commit | e46b5a095b408fcb14b694e5176a07cb855afd6b (patch) | |
| tree | 0b4f9b54290b5385f522898e25fa77e961663954 /webkit | |
| parent | 89715c9a225cb6bffe121693ca970700aa63ecd0 (diff) | |
| download | chromium_src-e46b5a095b408fcb14b694e5176a07cb855afd6b.zip chromium_src-e46b5a095b408fcb14b694e5176a07cb855afd6b.tar.gz chromium_src-e46b5a095b408fcb14b694e5176a07cb855afd6b.tar.bz2 | |
Internal plugin needs to be loaded in a different place for the Linux sandbox.
Review URL: http://codereview.chromium.org/2817012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50066 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/plugin_lib.cc | 4 | ||||
| -rw-r--r-- | webkit/glue/plugins/plugin_lib.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/plugins/plugin_lib.cc b/webkit/glue/plugins/plugin_lib.cc index d3ae50e..dfc6345 100644 --- a/webkit/glue/plugins/plugin_lib.cc +++ b/webkit/glue/plugins/plugin_lib.cc @@ -139,9 +139,9 @@ void PluginLib::PreventLibraryUnload() { skip_unload_ = true; } -void PluginLib::EnsureAlwaysLoaded() { +bool PluginLib::EnsureAlwaysLoaded() { always_loaded_ = true; - Load(); + return Load(); } PluginInstance* PluginLib::CreateInstance(const std::string& mime_type) { diff --git a/webkit/glue/plugins/plugin_lib.h b/webkit/glue/plugins/plugin_lib.h index 3888eec..32d8a14 100644 --- a/webkit/glue/plugins/plugin_lib.h +++ b/webkit/glue/plugins/plugin_lib.h @@ -79,7 +79,7 @@ class PluginLib : public base::RefCounted<PluginLib> { void PreventLibraryUnload(); // Loads the library now and ensures it's never unloaded. - void EnsureAlwaysLoaded(); + bool EnsureAlwaysLoaded(); // protected for testability. protected: |