diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 00:43:15 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 00:43:15 +0000 |
| commit | 0b537a44c49a3ce217d7e21befd84224d089d588 (patch) | |
| tree | d674da2bfd5189f1b23fe359dd760e9188ba7299 /chrome/app | |
| parent | bb837f9287259862c94155cc59cfc9e1bdfe1258 (diff) | |
| download | chromium_src-0b537a44c49a3ce217d7e21befd84224d089d588.zip chromium_src-0b537a44c49a3ce217d7e21befd84224d089d588.tar.gz chromium_src-0b537a44c49a3ce217d7e21befd84224d089d588.tar.bz2 | |
Revert 76840 - Removed GPU plugin.
Pepper 3D v2 does not use the GPU plugin. It is integrated with the accelerated compositor.
TEST=PPAPI 3D v2 still works, trybots
BUG=none
Review URL: http://codereview.chromium.org/6588090
TBR=apatrick@chromium.org
Review URL: http://codereview.chromium.org/6614030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76845 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_main.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc index b8f5a15..71bb4c2 100644 --- a/chrome/app/chrome_main.cc +++ b/chrome/app/chrome_main.cc @@ -517,6 +517,12 @@ int ChromeMain(int argc, char** argv) { return 1; #endif + if (command_line.HasSwitch(switches::kEnableNaCl)) { + // NaCl currently requires two flags to run + CommandLine* singleton_command_line = CommandLine::ForCurrentProcess(); + singleton_command_line->AppendSwitch(switches::kEnableGPUPlugin); + } + base::ProcessId browser_pid = base::GetCurrentProcId(); if (SubprocessIsBrowserChild(process_type)) { #if defined(OS_WIN) || defined(OS_MACOSX) |