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 /chrome/default_plugin | |
| 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 'chrome/default_plugin')
| -rw-r--r-- | chrome/default_plugin/plugin_main.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/default_plugin/plugin_main.cc b/chrome/default_plugin/plugin_main.cc index 2e5b808..f7b15ab 100644 --- a/chrome/default_plugin/plugin_main.cc +++ b/chrome/default_plugin/plugin_main.cc @@ -163,13 +163,6 @@ NPError NPP_New(NPMIMEType plugin_type, NPP instance, uint16_t mode, if (instance == NULL) return NPERR_INVALID_INSTANCE_ERROR; - // We don't want the null plugin to work in the following cases:- - // 1. Test-shell - // 2. The plugin is running in the renderer process. - if (webkit_glue::IsPluginRunningInRendererProcess()) { - return NPERR_GENERIC_ERROR; - } - if (!NegotiateModels(instance)) return NPERR_INCOMPATIBLE_VERSION_ERROR; |