Camino only - Bug 378081: Use tags to remove dangerous link context menu items. r=kreeger sr=pink

camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib

@@ -10,13 +10,19 @@
 		<string>679 653 370 64 0 0 1680 1028 </string>
 		<key>297</key>
 		<string>67 302 226 337 0 0 1680 1028 </string>
+		<key>336</key>
+		<string>67 302 226 206 0 0 1680 1028 </string>
+		<key>463</key>
+		<string>71 338 226 294 0 0 1680 1028 </string>
 	</dict>
 	<key>IBFramework Version</key>
 	<string>446.1</string>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>806</integer>
+		<integer>336</integer>
 		<integer>1066</integer>
+		<integer>463</integer>
+		<integer>806</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8P2137</string>

camino/src/browser/BrowserWindowController.mm

@@ -178,6 +178,7 @@ const int kSelectionRelatedItemsTag = 102;
 const int kSpellingRelatedItemsTag = 103;
 const int kItemsNeedingOpenBehaviorAlternatesTag = 104;
 const int kItemsNeedingForceAlternateTag = 105;
+const int kLinkOpeningItemsTag = 106;
 
 // Cached toolbar defaults read in from a plist. If null, we'll use
 // hardcoded defaults.
@@ -4165,13 +4166,9 @@ enum BWCOpenDest {
   NSMenu* result = [[menuPrototype copy] autorelease];
 
   if (isUnsafeLink) {
-    // To avoid updating the BrowserWindow.nib close to release time, the
-    // menu items to remove will be removed from index 0 three times. After
-    // the 1.1 release, this needs to be changed (see bug 378081). The first
-    // two remove calls will pull out the "Open Link in *" menu items.
-    [result removeItemAtIndex:0];
-    [result removeItemAtIndex:0];
-    [result removeItemAtIndex:0];  // remove separator 
+    NSMenuItem* frameItem;
+    while ((frameItem = [result itemWithTag:kLinkOpeningItemsTag]) != nil)
+      [result removeItem:frameItem];
   }
 
   // validate View Page/Frame Source