3 files changed, 0 insertions, 11 deletions
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 9a5d1a7..ac286a7 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -157,15 +157,9 @@ WebPreferences RenderViewHostDelegateHelper::GetWebkitPrefs(
     web_prefs.web_security_enabled =
         !command_line.HasSwitch(switches::kDisableWebSecurity) &&
         prefs->GetBoolean(prefs::kWebKitWebSecurityEnabled);
-#if defined(OS_WIN) || defined(OS_MACOSX)
     web_prefs.plugins_enabled =
         !command_line.HasSwitch(switches::kDisablePlugins) &&
         prefs->GetBoolean(prefs::kWebKitPluginsEnabled);
-#else
-    web_prefs.plugins_enabled =
-        command_line.HasSwitch(switches::kEnablePlugins) &&
-        prefs->GetBoolean(prefs::kWebKitPluginsEnabled);
-#endif
     web_prefs.java_enabled =
         !command_line.HasSwitch(switches::kDisableJava) &&
         prefs->GetBoolean(prefs::kWebKitJavaEnabled);
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index db5219c..6c9bd72 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -354,10 +354,6 @@ const wchar_t kDisableJava[]                   = L"disable-java";
 // Prevent plugins from running.
 const wchar_t kDisablePlugins[]                = L"disable-plugins";
 
-// Force plugins to run (for ports in progress where they are turned off by
-// default).
-const wchar_t kEnablePlugins[]                 = L"enable-plugins";
-
 // Prevent images from loading.
 const wchar_t kDisableImages[]                 = L"disable-images";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index fe51017..077127e 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -126,7 +126,6 @@ extern const wchar_t kDisablePopupBlocking[];
 extern const wchar_t kDisableJavaScript[];
 extern const wchar_t kDisableJava[];
 extern const wchar_t kDisablePlugins[];
-extern const wchar_t kEnablePlugins[];
 extern const wchar_t kDisableImages[];
 extern const wchar_t kDisableWebSecurity[];
 extern const wchar_t kEnableRemoteFonts[];