diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-15 16:33:13 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-15 16:33:13 +0000 |
| commit | 7107d9d24e79737ef722239c74a92b962483e199 (patch) | |
| tree | fbb64d9c8ab76fd93a5effdbb724967af4a5aa2b /chrome/app | |
| parent | 6e8a8a507dda5146e4d1a56fe0a0d7a44d5bdd29 (diff) | |
| download | chromium_src-7107d9d24e79737ef722239c74a92b962483e199.zip chromium_src-7107d9d24e79737ef722239c74a92b962483e199.tar.gz chromium_src-7107d9d24e79737ef722239c74a92b962483e199.tar.bz2 | |
[Mac] Confirm-to-quit: show the right key combo if it has been remapped.
BUG=65209
TEST=Add a custom keyboard shortcut to override the "Quit Chromium" menu item in System Prefs. Run with --enable-confirm-to-quit. Hit the key combination and the panel now shows the right key combination.
Review URL: http://codereview.chromium.org/6525001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74954 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 2 | ||||
| -rw-r--r-- | chrome/app/nibs/ConfirmQuitPanel.xib | 27 |
2 files changed, 24 insertions, 5 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 4c12985..0f14aeb 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4678,7 +4678,7 @@ Keep your key file in a safe place. You will need it to create new versions of y <!-- Confirm to quit panel --> <message name="IDS_CONFIRM_TO_QUIT_DESCRIPTION" desc="Instructions for how the user should confirm quitting."> - Hold ⌘Q to Quit. + Hold <ph name="KEY_EQUIVALENT">$1<ex>⌘Q</ex></ph> to Quit. </message> <!-- Importer Lock Dialog --> diff --git a/chrome/app/nibs/ConfirmQuitPanel.xib b/chrome/app/nibs/ConfirmQuitPanel.xib index 4fc4240..a88cc05 100644 --- a/chrome/app/nibs/ConfirmQuitPanel.xib +++ b/chrome/app/nibs/ConfirmQuitPanel.xib @@ -2,10 +2,10 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10F2108</string> + <string key="IBDocument.SystemVersion">10J567</string> <string key="IBDocument.InterfaceBuilderVersion">823</string> - <string key="IBDocument.AppKitVersion">1038.29</string> - <string key="IBDocument.HIToolboxVersion">461.00</string> + <string key="IBDocument.AppKitVersion">1038.35</string> + <string key="IBDocument.HIToolboxVersion">462.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="NS.object.0">823</string> @@ -121,6 +121,14 @@ </object> <int key="connectionID">11</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">message_</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="369287154"/> + </object> + <int key="connectionID">12</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -239,7 +247,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">11</int> + <int key="maxID">12</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -266,6 +274,17 @@ <string key="candidateClassName">id</string> </object> </object> + <object class="NSMutableDictionary" key="outlets"> + <string key="NS.key.0">message_</string> + <string key="NS.object.0">NSTextField</string> + </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <string key="NS.key.0">message_</string> + <object class="IBToOneOutletInfo" key="NS.object.0"> + <string key="name">message_</string> + <string key="candidateClassName">NSTextField</string> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">browser/ui/cocoa/confirm_quit_panel_controller.h</string> |