Add "Force Reload This Page" menu item on Mac.

This CL adds a menu item "Force Reload This Page" with keyboard shortcut Command-Shift-R to the View menu in MainMenu.xib as an alternative, meaning it is shown instead of "Reload This Page" when the shift key is held down.

BUG=36245
TEST=Open the view menu. Pressing shift should change "reload this page" into
"force reload this page", which should do what it says. Also, Command-Shift-R
should do the same thing. Astronomy picture of the day is a good test site for
this.

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

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

2 files changed, 36 insertions, 6 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 7991ccb..e7b3c10 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6391,9 +6391,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
         <message name="IDS_STOP_MENU_MAC" desc="The Mac menu item stop in the view menu.">
           Stop
         </message>
-        <message name="IDS_RELOAD_MENU_MAC" desc="The Mac menu item reload in the view menu.">
+        <message name="IDS_RELOAD_MENU_MAC" desc="The Mac menu item to reload the current page in the view menu.">
           Reload This Page
         </message>
+        <message name="IDS_RELOAD_IGNORING_CACHE_MENU_MAC" desc="The Mac menu item to force reload the current page (ignoring cache) in the view menu.">
+          Force Reload This Page
+        </message>
         <message name="IDS_FULLSCREEN_MAC" desc="The Mac menu item to go into fullscreen mode in the view menu.">
           Full Screen
         </message>
diff --git a/chrome/app/nibs/MainMenu.xib b/chrome/app/nibs/MainMenu.xib
index 6ecde94..b56dc08 100644
--- a/chrome/app/nibs/MainMenu.xib
+++ b/chrome/app/nibs/MainMenu.xib
@@ -8,7 +8,7 @@
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="130"/>
+			<integer value="296"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -702,6 +702,17 @@
 									<reference key="NSMixedImage" ref="549394948"/>
 									<int key="NSTag">33002</int>
 								</object>
+								<object class="NSMenuItem" id="902861825">
+									<reference key="NSMenu" ref="466310130"/>
+									<bool key="NSIsAlternate">YES</bool>
+									<string key="NSTitle">^IDS_RELOAD_IGNORING_CACHE_MENU_MAC</string>
+									<string key="NSKeyEquiv">R</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="353210768"/>
+									<reference key="NSMixedImage" ref="549394948"/>
+									<int key="NSTag">33007</int>
+								</object>
 								<object class="NSMenuItem" id="946218152">
 									<reference key="NSMenu" ref="466310130"/>
 									<bool key="NSIsDisabled">YES</bool>
@@ -1744,6 +1755,14 @@
 					</object>
 					<int key="connectionID">675</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">commandDispatch:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="902861825"/>
+					</object>
+					<int key="connectionID">677</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -2211,6 +2230,7 @@
 							<reference ref="530225222"/>
 							<reference ref="350076160"/>
 							<reference ref="577314768"/>
+							<reference ref="902861825"/>
 						</object>
 						<reference key="parent" ref="586577488"/>
 					</object>
@@ -2600,6 +2620,11 @@
 						<reference key="object" ref="226650579"/>
 						<reference key="parent" ref="891828782"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">676</int>
+						<reference key="object" ref="902861825"/>
+						<reference key="parent" ref="466310130"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2796,6 +2821,7 @@
 					<string>670.IBPluginDependency</string>
 					<string>672.IBPluginDependency</string>
 					<string>674.IBPluginDependency</string>
+					<string>676.IBPluginDependency</string>
 					<string>72.IBPluginDependency</string>
 					<string>72.ImportedFromIB2</string>
 					<string>73.IBPluginDependency</string>
@@ -2876,7 +2902,7 @@
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{482, 63}, {358, 243}}</string>
+					<string>{{419, 345}, {361, 243}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{197, 734}, {243, 243}}</string>
@@ -2920,13 +2946,13 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{525, 802}, {197, 73}}</string>
-					<string>{{37, 379}, {1578, 20}}</string>
+					<string>{{-219, 490}, {1578, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{74, 862}</string>
 					<string>{{11, 977}, {478, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{654, 93}, {383, 213}}</string>
+					<string>{{368, 257}, {402, 233}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{475, 832}, {234, 43}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3014,6 +3040,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
@@ -3059,7 +3086,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">675</int>
+			<int key="maxID">677</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">