summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-14 15:23:39 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-14 15:23:39 +0000
commit6420421e6f15f25891c88661431ce9483ccfdba7 (patch)
tree388278f27e01d35fc3fbdbe691417ff520e49062 /chrome/app
parentda5f6a8c64d48c97ed538bf5e28fb1e6d029c38c (diff)
downloadchromium_src-6420421e6f15f25891c88661431ce9483ccfdba7.zip
chromium_src-6420421e6f15f25891c88661431ce9483ccfdba7.tar.gz
chromium_src-6420421e6f15f25891c88661431ce9483ccfdba7.tar.bz2
Collapse bookmark bars into a single bar per window, rather than one per tab.
Create a separate controller for the bar. Hide bar when it's not supposed to be visible instead of just allowing it to be covered by content (it's not always covered, which leads to drawing errors). git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13661 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/nibs/en.lproj/TabContents.xib46
1 files changed, 5 insertions, 41 deletions
diff --git a/chrome/app/nibs/en.lproj/TabContents.xib b/chrome/app/nibs/en.lproj/TabContents.xib
index 154a722..c985de4 100644
--- a/chrome/app/nibs/en.lproj/TabContents.xib
+++ b/chrome/app/nibs/en.lproj/TabContents.xib
@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">9F33</string>
+ <string key="IBDocument.SystemVersion">9G55</string>
<string key="IBDocument.InterfaceBuilderVersion">677</string>
- <string key="IBDocument.AppKitVersion">949.34</string>
- <string key="IBDocument.HIToolboxVersion">352.00</string>
+ <string key="IBDocument.AppKitVersion">949.43</string>
+ <string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="94"/>
@@ -55,13 +55,6 @@
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSCustomView" id="741487837">
- <reference key="NSNextResponder" ref="675542922"/>
- <int key="NSvFlags">266</int>
- <string key="NSFrame">{{0, 322}, {480, 38}}</string>
- <reference key="NSSuperview" ref="675542922"/>
- <string key="NSClassName">ToolbarView</string>
- </object>
<object class="NSBox" id="753762894">
<reference key="NSNextResponder" ref="675542922"/>
<int key="NSvFlags">18</int>
@@ -150,14 +143,6 @@
</object>
<int key="connectionID">176</int>
</object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">bookmarkView_</string>
- <reference key="source" ref="326691890"/>
- <reference key="destination" ref="741487837"/>
- </object>
- <int key="connectionID">194</int>
- </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -199,7 +184,6 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="753762894"/>
<reference ref="995989345"/>
- <reference ref="741487837"/>
</object>
<reference key="parent" ref="886393115"/>
</object>
@@ -222,14 +206,6 @@
<reference key="object" ref="995989345"/>
<reference key="parent" ref="675542922"/>
</object>
- <object class="IBObjectRecord">
- <int key="objectID">179</int>
- <reference key="object" ref="741487837"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
- <reference key="parent" ref="675542922"/>
- </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -241,7 +217,6 @@
<string>-3.IBPluginDependency</string>
<string>164.IBPluginDependency</string>
<string>175.IBPluginDependency</string>
- <string>179.IBPluginDependency</string>
<string>93.IBEditorWindowLastContentRect</string>
<string>93.IBViewEditorWindowController.showingLayoutRectangles</string>
<string>93.IBWindowTemplateEditedContentRect</string>
@@ -258,10 +233,9 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{1032, 413}, {480, 360}}</string>
+ <string>{{769, 584}, {480, 360}}</string>
<boolean value="YES" id="5"/>
- <string>{{1032, 413}, {480, 360}}</string>
+ <string>{{769, 584}, {480, 360}}</string>
<reference ref="5"/>
<reference ref="5"/>
<string>{480, 360}</string>
@@ -332,13 +306,11 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>bookmarkView_</string>
<string>contentsBox_</string>
<string>growBox_</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>ToolbarView</string>
<string>NSBox</string>
<string>GrowBoxView</string>
</object>
@@ -348,14 +320,6 @@
<string key="minorKey">browser/cocoa/tab_contents_controller.h</string>
</object>
</object>
- <object class="IBPartialClassDescription">
- <string key="className">ToolbarView</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">browser/cocoa/toolbar_view.h</string>
- </object>
- </object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>