diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 05:22:54 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 05:22:54 +0000 |
| commit | d737033fa62ac19f27995ad0deb84e657e2c0755 (patch) | |
| tree | 5b62a38ee29b3bfa2353a8b5a0d27092350751be /chrome/app/nibs | |
| parent | 8a8ce8c0491c75486edd2865dd5801a91b3fcd86 (diff) | |
| download | chromium_src-d737033fa62ac19f27995ad0deb84e657e2c0755.zip chromium_src-d737033fa62ac19f27995ad0deb84e657e2c0755.tar.gz chromium_src-d737033fa62ac19f27995ad0deb84e657e2c0755.tar.bz2 | |
Mac: Select right tab in content settings dialog.
Also fix an unrelated TODO in this area.
xib change: Make ContentSettingsWindowController the NSTabView's delegate and hook the controller's IBOutlet up to the NSTabView.
BUG=36949
TEST=Open content settings via a blocked popups bubble. Popup tab should be selected. Select javascript tab, close window. Reopen window, javascript tab should still be selected.
Review URL: http://codereview.chromium.org/661354
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/nibs')
| -rw-r--r-- | chrome/app/nibs/ContentSettings.xib | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/chrome/app/nibs/ContentSettings.xib b/chrome/app/nibs/ContentSettings.xib index 2cf8c57..fbb58cd 100644 --- a/chrome/app/nibs/ContentSettings.xib +++ b/chrome/app/nibs/ContentSettings.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="68"/> + <integer value="2"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1818,6 +1818,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <int key="connectionID">112</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="604468971"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">113</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">tabView_</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="604468971"/> + </object> + <int key="connectionID">114</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -2555,7 +2571,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> <nil key="sourceID"/> - <int key="maxID">112</int> + <int key="maxID">114</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -2594,6 +2610,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>id</string> </object> </object> + <object class="NSMutableDictionary" key="outlets"> + <string key="NS.key.0">tabView_</string> + <string key="NS.object.0">NSTabView</string> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">browser/cocoa/content_settings_dialog_controller.h</string> |