summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-22 17:59:08 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-22 17:59:08 +0000
commit9912cd8c8bb8e89df4b33ba91c6c533e50132dca (patch)
treebbd8e8dac91b8adae93d47dd4ea63caec39af9c7 /chrome/app
parent2b74c093728f3bf35a0dc6b444bde69074f99f5d (diff)
downloadchromium_src-9912cd8c8bb8e89df4b33ba91c6c533e50132dca.zip
chromium_src-9912cd8c8bb8e89df4b33ba91c6c533e50132dca.tar.gz
chromium_src-9912cd8c8bb8e89df4b33ba91c6c533e50132dca.tar.bz2
Hook up the browser in the bookmark editor. Adjust the logic controlling the OK button enabling.
In the BookmarkEditor.xib: Connect the NSBrowser's delegate (showing the bookmark tree) to the File's Owner (BookmarkEditorController). Patch from Mike Rossetti (mrosseti@chromium.org) Original review at: http://codereview.chromium.org/287014 BUG=17613 TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/nibs/BookmarkEditor.xib42
1 files changed, 24 insertions, 18 deletions
diff --git a/chrome/app/nibs/BookmarkEditor.xib b/chrome/app/nibs/BookmarkEditor.xib
index 8986d3c..5b8cc25 100644
--- a/chrome/app/nibs/BookmarkEditor.xib
+++ b/chrome/app/nibs/BookmarkEditor.xib
@@ -1,28 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02">
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">9L30</string>
- <string key="IBDocument.InterfaceBuilderVersion">677</string>
+ <string key="IBDocument.InterfaceBuilderVersion">670</string>
<string key="IBDocument.AppKitVersion">949.54</string>
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="44"/>
+ <integer value="2"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- </object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSCustomObject" id="1001">
@@ -71,7 +62,7 @@
<int key="NSColumnResizingType">1</int>
<double key="NSPreferedColumnWidth">1.000000e+02</double>
<bool key="NSAllowsTypeSelect">YES</bool>
- <int key="NSBrFlags">469843968</int>
+ <int key="NSBrFlags">1544765440</int>
</object>
<object class="NSCustomView" id="138844528">
<reference key="NSNextResponder" ref="1006"/>
@@ -432,6 +423,14 @@
</object>
<int key="connectionID">43</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="723395462"/>
+ <reference key="destination" ref="1001"/>
+ </object>
+ <int key="connectionID">53</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -681,15 +680,15 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{555, 472}, {480, 270}}</string>
+ <string>{{626, 873}, {480, 270}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="NO" id="6"/>
- <string>{{555, 472}, {480, 270}}</string>
+ <integer value="0" id="6"/>
+ <string>{{626, 873}, {480, 270}}</string>
<reference ref="6"/>
<string>{196, 240}</string>
<string>{{357, 418}, {480, 270}}</string>
<reference ref="6"/>
- <boolean value="YES"/>
+ <integer value="1"/>
<string>{331, 270}</string>
<string>{331, 270}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -735,7 +734,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">44</int>
+ <int key="maxID">54</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -870,6 +869,13 @@
<string key="minorKey">browser/cocoa/tab_strip_model_observer_bridge.h</string>
</object>
</object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSWindow</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">browser/cocoa/nswindow_local_state.h</string>
+ </object>
+ </object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>