diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 03:01:21 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-18 03:01:21 +0000 |
| commit | 79970a2cfbe87224954b281984e2e67c593ea13c (patch) | |
| tree | 19f8825cd7c8182742f1566bfee5ad45af2bcc23 /chrome/browser/plugin_service.cc | |
| parent | c31df6877d7b45075decbe97da47d6c783de62ed (diff) | |
| download | chromium_src-79970a2cfbe87224954b281984e2e67c593ea13c.zip chromium_src-79970a2cfbe87224954b281984e2e67c593ea13c.tar.gz chromium_src-79970a2cfbe87224954b281984e2e67c593ea13c.tar.bz2 | |
Preparing rollback in case things don't work out.
This rolls back 26540, gregoryd's attempt at a nacl landing.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/213019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_service.cc')
| -rw-r--r-- | chrome/browser/plugin_service.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc index ab5ece1..1d767bd 100644 --- a/chrome/browser/plugin_service.cc +++ b/chrome/browser/plugin_service.cc @@ -23,7 +23,6 @@ #include "chrome/common/notification_type.h" #include "chrome/common/notification_service.h" #include "chrome/common/render_messages.h" -#include "native_client/src/trusted/plugin/nacl_entry_points.h" #include "webkit/glue/plugins/plugin_constants_win.h" #include "webkit/glue/plugins/plugin_list.h" @@ -45,15 +44,6 @@ PluginService::PluginService() NPAPI::PluginList::Singleton()->AddExtraPluginPath( FilePath::FromWStringHack(path)); } - if (command_line->HasSwitch(switches::kInternalNaCl)) { - NPAPI::PluginEntryPoints entry_points = { -#if !defined(OS_LINUX) - NaCl_NP_GetEntryPoints, -#endif - NaCl_NP_Initialize, - NaCl_NP_Shutdown}; - NPAPI::PluginList::UseInternalNaCl(&entry_points); - } #if defined(OS_WIN) hkcu_key_.Create( |