diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-08 01:54:04 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-08 01:54:04 +0000 |
| commit | 9ad566288f5f4972570cd52cf6258d2ab0fe5090 (patch) | |
| tree | 7b209924d32e0c46322893540f1a0f0dc9a389c6 /chrome/app | |
| parent | 8544565b68121f3808f612550c9044962aab98f4 (diff) | |
| download | chromium_src-9ad566288f5f4972570cd52cf6258d2ab0fe5090.zip chromium_src-9ad566288f5f4972570cd52cf6258d2ab0fe5090.tar.gz chromium_src-9ad566288f5f4972570cd52cf6258d2ab0fe5090.tar.bz2 | |
Reland r76840 with fix for webkit_gpu dependencies.
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/6635026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77228 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_main.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc index 71bb4c2..b8f5a15 100644 --- a/chrome/app/chrome_main.cc +++ b/chrome/app/chrome_main.cc @@ -517,12 +517,6 @@ 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) |