Fixes for Report Bug Dialog:

* Honor "send screenshot" checkbox
* Save bug description and send screenshot state if user chooses "phishing report" function (that disables both); restore if the user goes back to a non-phishing bug.
* Make bug report give consistent and correct values for bug type.

BUG= 27283, 27282, 27281
TEST= Fill in data in bug description, toggle send screenshot "on". Move between "phishing" and non-phishing reports before sending. Note that description goes away and reappears appropriately.
 
Review URL: http://codereview.chromium.org/385047

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

1 files changed, 69 insertions, 39 deletions

diff --git a/chrome/app/nibs/ReportBug.xib b/chrome/app/nibs/ReportBug.xib
index 4ef70db..e0253d2 100644
--- a/chrome/app/nibs/ReportBug.xib
+++ b/chrome/app/nibs/ReportBug.xib
@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">9L30</string>
+		<string key="IBDocument.SystemVersion">9L31a</string>
 		<string key="IBDocument.InterfaceBuilderVersion">677</string>
 		<string key="IBDocument.AppKitVersion">949.54</string>
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="2"/>
+			<integer value="138"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -436,23 +436,6 @@
 					<int key="connectionID">98</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">selectedIndex: bugType</string>
-						<reference key="source" ref="304367917"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="304367917"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">selectedIndex: bugType</string>
-							<string key="NSBinding">selectedIndex</string>
-							<string key="NSKeyPath">bugType</string>
-							<reference key="NSPreviousConnector" ref="982383136"/>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">99</int>
-				</object>
-				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">sendReport:</string>
 						<reference key="source" ref="1001"/>
@@ -533,22 +516,6 @@
 					<int key="connectionID">133</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: bugDescription</string>
-						<reference key="source" ref="907418310"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="907418310"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">value: bugDescription</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">bugDescription</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">134</int>
-				</object>
-				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">sendReportButton_</string>
 						<reference key="source" ref="1001"/>
@@ -616,6 +583,67 @@
 					</object>
 					<int key="connectionID">143</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">bugTypePopUpButton_</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="304367917"/>
+					</object>
+					<int key="connectionID">144</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: bugDescription</string>
+						<reference key="source" ref="907418310"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="907418310"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">value: bugDescription</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">bugDescription</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSContinuouslyUpdatesValue</string>
+								<boolean value="YES" key="NS.object.0"/>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">145</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: sendScreenshot</string>
+						<reference key="source" ref="563361046"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="563361046"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">value: sendScreenshot</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">sendScreenshot</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">147</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">selectedIndex: bugTypeIndex</string>
+						<reference key="source" ref="304367917"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="304367917"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">selectedIndex: bugTypeIndex</string>
+							<string key="NSBinding">selectedIndex</string>
+							<string key="NSKeyPath">bugTypeIndex</string>
+							<reference key="NSPreviousConnector" ref="982383136"/>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">148</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -924,10 +952,10 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{442, 726}, {500, 288}}</string>
+					<string>{{217, 711}, {500, 288}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="NO"/>
-					<string>{{442, 726}, {500, 288}}</string>
+					<string>{{217, 711}, {500, 288}}</string>
 					<integer value="1"/>
 					<string>{196, 240}</string>
 					<string>{{357, 418}, {480, 270}}</string>
@@ -946,7 +974,7 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{1042, 693}, {377, 6}}</string>
+					<string>{{537, 990}, {377, 6}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -983,7 +1011,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">143</int>
+			<int key="maxID">148</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1008,11 +1036,13 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSMutableArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>bugTypePopUpButton_</string>
 							<string>cancelButton_</string>
 							<string>sendReportButton_</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSPopUpButton</string>
 							<string>NSButton</string>
 							<string>NSButton</string>
 						</object>