diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-12 18:12:22 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-12 18:12:22 +0000 |
commit | a9e60072222bce1db00e65a80297f0ee0210a613 (patch) | |
tree | e757d7908a69a3bc115b6be02ce5325859885611 /chrome/app | |
parent | 3fbc8276f724079cb0e0ddd3899c3b49a40e11d9 (diff) | |
download | chromium_src-a9e60072222bce1db00e65a80297f0ee0210a613.zip chromium_src-a9e60072222bce1db00e65a80297f0ee0210a613.tar.gz chromium_src-a9e60072222bce1db00e65a80297f0ee0210a613.tar.bz2 |
Mac: Tell task manager model to stop updating when the task manager window is closed.
Also change how the controller is deallocated, which should fix a valgrind bug.
Nib change: Make TaskManagerWindowController the delegate of the window in the nib, so that its windowWillClose: gets called.
TFR=trungl
BUG=13156,30398
TEST=Open Activity Monitor, look at browser %cpu. Open chrome's task manager, note %cpu goes up slightly. Close task manager again, %cpu should go down again. Open task manager again, should still work.
Review URL: http://codereview.chromium.org/536026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36020 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r-- | chrome/app/nibs/TaskManager.xib | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/chrome/app/nibs/TaskManager.xib b/chrome/app/nibs/TaskManager.xib index a30d2d1..4231806 100644 --- a/chrome/app/nibs/TaskManager.xib +++ b/chrome/app/nibs/TaskManager.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="3"/> + <integer value="1" id="9"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -369,6 +369,14 @@ </object> <int key="connectionID">33</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="1005"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">34</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -564,7 +572,7 @@ <string>{{274, 515}, {480, 270}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{274, 515}, {480, 270}}</string> - <integer value="1"/> + <reference ref="9"/> <string>{196, 240}</string> <string>{{357, 418}, {480, 270}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -604,7 +612,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">33</int> + <int key="maxID">34</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -720,12 +728,14 @@ <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>killSelectedProcesses:</string> + <string>selectDoubleClickedTab:</string> <string>statsLinkClicked:</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>id</string> <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> |