summaryrefslogtreecommitdiffstats
path: root/chrome/app/nibs
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-09 21:49:42 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-09 21:49:42 +0000
commitbd7085d5e4dc43e93a104a767c3d59695be47c54 (patch)
tree71e895147474cbd49011d2926bee4139d4feb941 /chrome/app/nibs
parent7eab942976f202aa6d4e89c57ec23406cab34741 (diff)
downloadchromium_src-bd7085d5e4dc43e93a104a767c3d59695be47c54.zip
chromium_src-bd7085d5e4dc43e93a104a767c3d59695be47c54.tar.gz
chromium_src-bd7085d5e4dc43e93a104a767c3d59695be47c54.tar.bz2
Mac: Connect "Task Manager" menu item.
Nib change: Connect "Task Manager" to first responder's commandDispatch:, give it tag 40005 (IDC_TASK_MANAGER in chrome/app/chrome_dll_resource.h), check "Enabled" checkbox (this has no effect, but is consistent with the rest of the nib). Due to http://codereview.chromium.org/518085 , the task manager is still disabled, but it's easier to turn on after this CL (only one small change in browser.cc). BUG=13156 TEST=Click View->Developer. "Task Manager" should still be disabled. Review URL: http://codereview.chromium.org/541005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/nibs')
-rw-r--r--chrome/app/nibs/MainMenu.xib20
1 files changed, 14 insertions, 6 deletions
diff --git a/chrome/app/nibs/MainMenu.xib b/chrome/app/nibs/MainMenu.xib
index 4fabcb9..fe5de3b 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="504"/>
+ <integer value="636"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -822,12 +822,12 @@
</object>
<object class="NSMenuItem" id="693413486">
<reference key="NSMenu" ref="99609113"/>
- <bool key="NSIsDisabled">YES</bool>
<string key="NSTitle">^IDS_TASK_MANAGER_MAC</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="353210768"/>
<reference key="NSMixedImage" ref="549394948"/>
+ <int key="NSTag">40005</int>
</object>
</object>
</object>
@@ -1736,6 +1736,14 @@
</object>
<int key="connectionID">673</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">commandDispatch:</string>
+ <reference key="source" ref="1014"/>
+ <reference key="destination" ref="693413486"/>
+ </object>
+ <int key="connectionID">675</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -2912,13 +2920,13 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{525, 802}, {197, 73}}</string>
- <string>{{64, 251}, {1578, 20}}</string>
+ <string>{{63, 306}, {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>{{651, 38}, {383, 213}}</string>
+ <string>{{650, 93}, {383, 213}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{475, 832}, {234, 43}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2953,7 +2961,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{1169, 7}, {320, 83}}</string>
+ <string>{{1033, 33}, {320, 83}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3051,7 +3059,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">674</int>
+ <int key="maxID">675</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">