turn on --enable-accelerated-plugins by default

BUG=93740
TEST=manual

Review URL: http://codereview.chromium.org/7757008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98727 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 6 insertions, 6 deletions

diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index 8c65281..71a6476 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -721,7 +721,7 @@ std::string LoginUtilsImpl::GetOffTheRecordCommandLine(
     CommandLine* command_line) {
   static const char* kForwardSwitches[] = {
       switches::kEnableLogging,
-      switches::kEnableAcceleratedPlugins,
+      switches::kDisableAcceleratedPlugins,
       switches::kUseGL,
       switches::kUserDataDir,
       switches::kScrollPixels,
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
index 41da738..4958bc8 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -447,7 +447,7 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
     web_prefs.composite_to_texture_enabled =
         command_line.HasSwitch(switches::kEnableCompositeToTexture);
     web_prefs.accelerated_plugins_enabled =
-        command_line.HasSwitch(switches::kEnableAcceleratedPlugins);
+        !command_line.HasSwitch(switches::kDisableAcceleratedPlugins);
     web_prefs.accelerated_video_enabled =
         !command_line.HasSwitch(switches::kDisableAcceleratedVideo);
     web_prefs.memory_info_enabled =
diff --git a/content/common/content_switches.cc b/content/common/content_switches.cc
index 452b4f3..f4d380b 100644
--- a/content/common/content_switches.cc
+++ b/content/common/content_switches.cc
@@ -39,6 +39,9 @@ const char kDisableAcceleratedCompositing[] = "disable-accelerated-compositing";
 // Disables the hardware acceleration of 3D CSS and animation.
 const char kDisableAcceleratedLayers[]      = "disable-accelerated-layers";
 
+// Disables the hardware acceleration of plugins.
+const char kDisableAcceleratedPlugins[]     = "disable-accelerated-plugins";
+
 // Disables GPU accelerated video display.
 const char kDisableAcceleratedVideo[]       = "disable-accelerated-video";
 
@@ -153,9 +156,6 @@ const char kEnableAccelerated2dCanvas[]     = "enable-accelerated-2d-canvas";
 // in build/features_override.gypi.
 const char kEnableAcceleratedDrawing[]      = "enable-accelerated-drawing";
 
-// Enables the hardware acceleration of plugins.
-const char kEnableAcceleratedPlugins[]      = "enable-accelerated-plugins";
-
 // Enables WebKit accessibility within the renderer process.
 const char kEnableAccessibility[]           = "enable-accessibility";
 
diff --git a/content/common/content_switches.h b/content/common/content_switches.h
index a1a8807..a248391 100644
--- a/content/common/content_switches.h
+++ b/content/common/content_switches.h
@@ -22,6 +22,7 @@ extern const char kDisable3DAPIs[];
 extern const char kDisableAccelerated2dCanvas[];
 extern const char kDisableAcceleratedCompositing[];
 extern const char kDisableAcceleratedLayers[];
+extern const char kDisableAcceleratedPlugins[];
 extern const char kDisableAcceleratedVideo[];
 extern const char kDisableAltWinstation[];
 extern const char kDisableApplicationCache[];
@@ -57,7 +58,6 @@ extern const char kDisableWebAudio[];
 extern const char kDisableWebSockets[];
 extern const char kEnableAccelerated2dCanvas[];
 extern const char kEnableAcceleratedDrawing[];
-extern const char kEnableAcceleratedPlugins[];
 extern const char kEnableAccessibility[];
 extern const char kEnableBenchmarking[];
 extern const char kEnableDeviceMotion[];