diff options
| author | sehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 17:45:03 +0000 |
|---|---|---|
| committer | sehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 17:45:03 +0000 |
| commit | c2dff4977f8dbd35fd467fb3785587cb634dd190 (patch) | |
| tree | 5ee05f387a75d856d29895f06f0c64156754c9ff /chrome/common | |
| parent | 5f6397ecb4c7bc92295adc8d21bd87e698ac5622 (diff) | |
| download | chromium_src-c2dff4977f8dbd35fd467fb3785587cb634dd190.zip chromium_src-c2dff4977f8dbd35fd467fb3785587cb634dd190.tar.gz chromium_src-c2dff4977f8dbd35fd467fb3785587cb634dd190.tar.bz2 | |
Revert 34161 - Enable Pepper support by default, including building the test plugin.
This is needed because the NaCl plugin code that runs in the renderer
needs to use Pepper APIs all the time, and NaCl support has been enabled
by default for several months now. To cause an untrusted Pepper plugin
to run in the renderer one needs to specify the internalpepper flag.
I have also removed the enable_pepper flag from gyp. As the build of the
GPU process was tied to this flag, I have renamed the flag to enable_gpu.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/464074
TBR=sehr@google.com
Review URL: http://codereview.chromium.org/475004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34162 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/chrome_switches.cc | 3 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index f64b451..3160bd8 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -313,9 +313,6 @@ const char kIncognito[] = "incognito"; // Runs the Native Client inside the renderer process. const char kInternalNaCl[] = "internal-nacl"; -// Runs a trusted Pepper plugin inside the renderer process. -const char kInternalPepper[] = "internal-pepper"; - // Specifies the flags passed to JS engine const char kJavaScriptFlags[] = "js-flags"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 9698cdf..5d97788 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -99,7 +99,6 @@ extern const char kImport[]; extern const char kInProcessPlugins[]; extern const char kIncognito[]; extern const char kInternalNaCl[]; -extern const char kInternalPepper[]; extern const char kJavaScriptFlags[]; extern const char kLoadExtension[]; extern const char kLoadPlugin[]; |