summaryrefslogtreecommitdiffstats
path: root/content/browser/plugin_service.cc
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-08 01:54:04 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-08 01:54:04 +0000
commit9ad566288f5f4972570cd52cf6258d2ab0fe5090 (patch)
tree7b209924d32e0c46322893540f1a0f0dc9a389c6 /content/browser/plugin_service.cc
parent8544565b68121f3808f612550c9044962aab98f4 (diff)
downloadchromium_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 'content/browser/plugin_service.cc')
-rw-r--r--content/browser/plugin_service.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/content/browser/plugin_service.cc b/content/browser/plugin_service.cc
index 1681770..4e68f23 100644
--- a/content/browser/plugin_service.cc
+++ b/content/browser/plugin_service.cc
@@ -23,7 +23,6 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/default_plugin.h"
#include "chrome/common/extensions/extension.h"
-#include "chrome/common/gpu_plugin.h"
#include "chrome/common/logging_chrome.h"
#include "chrome/common/notification_type.h"
#include "chrome/common/notification_service.h"
@@ -134,8 +133,6 @@ PluginService::PluginService()
plugin_selection_policy_->StartInit();
#endif
- chrome::RegisterInternalGPUPlugin();
-
// Start watching for changes in the plugin list. This means watching
// for changes in the Windows registry keys and on both Windows and POSIX
// watch for changes in the paths that are expected to contain plugins.