diff options
author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-28 20:45:32 +0000 |
---|---|---|
committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-28 20:45:32 +0000 |
commit | 63c8147ea589679a57838cfe721f8af5d7271a21 (patch) | |
tree | 28f82db467b4c65f5e0f8b7d36c969c7bd782a85 /webkit/glue/plugins/plugin_lib.h | |
parent | 85bb531af793ef2bf541e1c4547bc0dc57bb19e6 (diff) | |
download | chromium_src-63c8147ea589679a57838cfe721f8af5d7271a21.zip chromium_src-63c8147ea589679a57838cfe721f8af5d7271a21.tar.gz chromium_src-63c8147ea589679a57838cfe721f8af5d7271a21.tar.bz2 |
Revert 27397 - First step towards NaClChrome integration:1. NaCl plugin becomes a builtin plugin in Chrome and runs in the renderer process.2. Most of the changes are related to launching the NaCl process (that loads and runs the NaCl module) and establishing the initial communication between that process and the NaCl plugin.3. Command line flag "internalnacl" is required to enable the builtin NaCl plugin. NaCl still cannot run in Chrome sandbox, the flag automatically disables the sandboxCommitted: http://src.chromium.org/viewvc/chrome?view=rev&revision=27315
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=27324
Review URL: http://codereview.chromium.org/153002
TBR=gregoryd@google.com
Review URL: http://codereview.chromium.org/235042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27400 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins/plugin_lib.h')
-rw-r--r-- | webkit/glue/plugins/plugin_lib.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/webkit/glue/plugins/plugin_lib.h b/webkit/glue/plugins/plugin_lib.h index e8bb44a..ed523c12 100644 --- a/webkit/glue/plugins/plugin_lib.h +++ b/webkit/glue/plugins/plugin_lib.h @@ -61,8 +61,6 @@ class PluginLib : public base::RefCounted<PluginLib> { // supports. const WebPluginInfo& plugin_info() { return web_plugin_info_; } - bool internal() { return internal_; } - // // NPAPI functions // @@ -93,7 +91,7 @@ class PluginLib : public base::RefCounted<PluginLib> { void Shutdown(); private: - bool internal_; // True for plugins that are built-in into chrome binaries. + bool internal_; // Whether this an internal plugin. WebPluginInfo web_plugin_info_; // supported mime types, description base::NativeLibrary library_; // the opened library reference NPPluginFuncs plugin_funcs_; // the struct of plugin side functions |