diff options
author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 17:57:38 +0000 |
---|---|---|
committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-19 17:57:38 +0000 |
commit | 679d965b4292d028e68591c2d0d2b84e23eed005 (patch) | |
tree | 6b23e979cd5a2884564f83c7a1aca3c312f60ba1 /content | |
parent | d01f431e5e9eb08fbabd807985446c3169d0585d (diff) | |
download | chromium_src-679d965b4292d028e68591c2d0d2b84e23eed005.zip chromium_src-679d965b4292d028e68591c2d0d2b84e23eed005.tar.gz chromium_src-679d965b4292d028e68591c2d0d2b84e23eed005.tar.bz2 |
Miscellaneous webkit_glue namespace changes in preparation for building src\content as a dll. This CL
removes the IsDefaultPluginEnabled function in the webkit_glue namespace. This function has been replaced
by a flag in the PluginList instance which is set when the default plugin is registered as an internal plugin.
The webkit_glue.cc file now implements the GetApplicationDirectory and GetExeDirectory functions in the webkit_glue
namespace. Previously these functions were implemented in common_glue.cc and in test_shell.
Removed the IsPluginRunningInRendererProcess function from webkit_glue and fixed the callers to not depend on this
functionality.
BUG=82454
Review URL: http://codereview.chromium.org/6975028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85937 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r-- | content/plugin/plugin_thread.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc index b6ca82a..eda6c92 100644 --- a/content/plugin/plugin_thread.cc +++ b/content/plugin/plugin_thread.cc @@ -78,8 +78,12 @@ PluginThread::PluginThread() scoped_refptr<webkit::npapi::PluginLib> plugin( webkit::npapi::PluginLib::CreatePluginLib(plugin_path_)); - if (plugin.get()) + if (plugin.get()) { plugin->NP_Initialize(); + // For OOP plugins the plugin dll will be unloaded during process shutdown + // time. + plugin->set_defer_unload(true); + } content::GetContentClient()->plugin()->PluginProcessStarted( plugin.get() ? plugin->plugin_info().name : string16()); @@ -140,10 +144,6 @@ void PluginThread::OnNotifyRenderersOfPendingShutdown() { } namespace webkit_glue { -bool IsDefaultPluginEnabled() { - return true; -} - bool FindProxyForUrl(const GURL& url, std::string* proxy_list) { int net_error; std::string proxy_result; |