remove pref ui for disbling plugins as it has some major problems (specifically with js). bug 210724. sr=pinkerton

camino/PreferencePanes/WebFeatures/English.lproj/WebFeatures.nib/classes.nib

@@ -20,7 +20,6 @@
                 clickEnableImageResizing = id; 
                 clickEnableJS = id; 
                 clickEnableJava = id; 
-                clickEnablePlugins = id; 
                 clickEnablePopupBlocking = id; 
                 editWhitelist = id; 
                 editWhitelistDone = id; 
@@ -34,7 +33,6 @@
                 mEnableAnnoyanceBlocker = NSButton; 
                 mEnableJS = NSButton; 
                 mEnableJava = NSButton; 
-                mEnablePlugins = NSButton; 
                 mEnablePopupBlocking = NSButton; 
                 mImageResize = NSButton; 
                 mWhitelistPanel = id; 

camino/PreferencePanes/WebFeatures/English.lproj/WebFeatures.nib/info.nib

@@ -3,9 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>224 63 356 240 0 0 1280 832 </string>
+	<string>379 100 356 240 0 0 1920 1178 </string>
 	<key>IBFramework Version</key>
-	<string>362.0</string>
+	<string>364.0</string>
 	<key>IBGroupedObjects</key>
 	<dict>
 		<key>4</key>
@@ -13,7 +13,6 @@
 			<string>227</string>
 			<string>225</string>
 			<string>226</string>
-			<string>279</string>
 		</array>
 		<key>5</key>
 		<array>
@@ -25,11 +24,13 @@
 	</dict>
 	<key>IBLastGroupID</key>
 	<string>7</string>
+	<key>IBOldestOS</key>
+	<integer>2</integer>
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>5</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>7D24</string>
+	<string>7R28</string>
 </dict>
 </plist>

camino/PreferencePanes/WebFeatures/WebFeatures.h

@@ -11,7 +11,6 @@ class nsISupportsArray;
 {
   IBOutlet NSButton* mEnableJS;
   IBOutlet NSButton* mEnableJava;
-  IBOutlet NSButton* mEnablePlugins;
 
   IBOutlet NSButton *mEnablePopupBlocking;
   IBOutlet NSButton *mImageResize;
@@ -28,7 +27,6 @@ class nsISupportsArray;
 
 -(IBAction) clickEnableJS:(id)sender;
 -(IBAction) clickEnableJava:(id)sender;
--(IBAction) clickEnablePlugins:(id)sender;
 
 -(IBAction) clickEnablePopupBlocking:(id)sender;
 -(IBAction) clickEnableImageResizing:(id)sender;

camino/PreferencePanes/WebFeatures/WebFeatures.mm

@@ -31,8 +31,6 @@
   [mEnableJS setState:jsEnabled];
   BOOL javaEnabled = [self getBooleanPref:"security.enable_java" withSuccess:&gotPref] && gotPref;
   [mEnableJava setState:javaEnabled];
-  BOOL pluginsEnabled = [self getBooleanPref:"chimera.enable_plugins" withSuccess:&gotPref] && gotPref;
-  [mEnablePlugins setState:pluginsEnabled];
 
   // set initial value on popup blocking checkbox and disable the whitelist
   // button if it's off
@@ -77,16 +75,6 @@
   [self setPref:"security.enable_java" toBoolean:[sender state] == NSOnState];
 }
 
-//
-// clickEnablePlugins
-//
-// Set pref if plugins are enabled
-//
--(IBAction) clickEnablePlugins:(id)sender
-{
-  [self setPref:"chimera.enable_plugins" toBoolean:[sender state] == NSOnState];
-}
-
 //
 // clickEnablePopupBlocking
 //

camino/resources/application/all-camino.js

@@ -60,7 +60,7 @@ pref("browser.quartz.enable.all_font_sizes", true);
 pref("chimera.store_passwords_with_keychain", true);
 pref("chimera.keychain_passwords_autofill", true);
 
-pref("chimera.enable_plugins", true);
+pref("camino.enable_plugins", true);
 pref("chimera.log_js_to_console", true);
 
 // Identify Camino in the UA string

camino/src/browser/BrowserWrapper.mm

@@ -116,7 +116,7 @@ const NSString* kOfflineNotificationName = @"offlineModeChanged";
     mBlockedSites = nsnull;
 
     BOOL gotPref;
-    BOOL pluginsEnabled = [[PreferenceManager sharedInstance] getBooleanPref:"chimera.enable_plugins" withSuccess:&gotPref];
+    BOOL pluginsEnabled = [[PreferenceManager sharedInstance] getBooleanPref:"camino.enable_plugins" withSuccess:&gotPref];
     if (gotPref && !pluginsEnabled)
       [mBrowserView setProperty:nsIWebBrowserSetup::SETUP_ALLOW_PLUGINS toValue:PR_FALSE];