summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-20 16:48:29 +0000
committerpinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-20 16:48:29 +0000
commitb3e3a7c25563c04221141be853d91af264c8c440 (patch)
tree3fad894326a1e5514fcff26710a0541253a49ebd /chrome/app
parent42179c2ecb844952a49c44c7598400b7f69270db (diff)
downloadchromium_src-b3e3a7c25563c04221141be853d91af264c8c440.zip
chromium_src-b3e3a7c25563c04221141be853d91af264c8c440.tar.gz
chromium_src-b3e3a7c25563c04221141be853d91af264c8c440.tar.bz2
Roll our own grow box since the OS one wants to indent by 3px due to the textured window style.
Review URL: http://codereview.chromium.org/21544 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10099 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/nibs/English.lproj/BrowserWindow.xib10
-rw-r--r--chrome/app/nibs/English.lproj/TabContents.xib141
-rw-r--r--chrome/app/theme/grow_box.pngbin0 -> 237 bytes
3 files changed, 98 insertions, 53 deletions
diff --git a/chrome/app/nibs/English.lproj/BrowserWindow.xib b/chrome/app/nibs/English.lproj/BrowserWindow.xib
index c295123..9dd9841 100644
--- a/chrome/app/nibs/English.lproj/BrowserWindow.xib
+++ b/chrome/app/nibs/English.lproj/BrowserWindow.xib
@@ -8,7 +8,6 @@
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="56"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -35,7 +34,7 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSWindowTemplate" id="1005">
- <int key="NSWindowStyleMask">4367</int>
+ <int key="NSWindowStyleMask">4359</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{60, 229}, {720, 578}}</string>
<int key="NSWTFlags">536870912</int>
@@ -99,10 +98,9 @@
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
</object>
<object class="NSCustomView" id="1029219716">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">266</int>
<string key="NSFrameSize">{483, 25}</string>
- <reference key="NSSuperview"/>
<string key="NSClassName">TabStripView</string>
</object>
</object>
@@ -233,9 +231,9 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{403, 402}, {720, 578}}</string>
+ <string>{{136, 278}, {720, 578}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{403, 402}, {720, 578}}</string>
+ <string>{{136, 278}, {720, 578}}</string>
<boolean value="NO"/>
<string>{196, 240}</string>
<string>{{357, 418}, {480, 270}}</string>
diff --git a/chrome/app/nibs/English.lproj/TabContents.xib b/chrome/app/nibs/English.lproj/TabContents.xib
index 53e1ef9..0f493fa 100644
--- a/chrome/app/nibs/English.lproj/TabContents.xib
+++ b/chrome/app/nibs/English.lproj/TabContents.xib
@@ -8,7 +8,6 @@
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="94"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -55,6 +54,53 @@
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSBox" id="753762894">
+ <reference key="NSNextResponder" ref="675542922"/>
+ <int key="NSvFlags">18</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSView" id="250835567">
+ <reference key="NSNextResponder" ref="753762894"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrameSize">{480, 322}</string>
+ <reference key="NSSuperview" ref="753762894"/>
+ <reference key="NSWindow"/>
+ </object>
+ </object>
+ <string key="NSFrameSize">{480, 322}</string>
+ <reference key="NSSuperview" ref="675542922"/>
+ <reference key="NSWindow"/>
+ <string key="NSOffsets">{0, 0}</string>
+ <object class="NSTextFieldCell" key="NSTitleCell">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">Box</string>
+ <object class="NSFont" key="NSSupport">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">1.100000e+01</double>
+ <int key="NSfFlags">3100</int>
+ </object>
+ <object class="NSColor" key="NSBackgroundColor" id="619004855">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">textBackgroundColor</string>
+ <object class="NSColor" key="NSColor" id="524635398">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
+ </object>
+ <object class="NSColor" key="NSTextColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
+ </object>
+ </object>
+ <reference key="NSContentView" ref="250835567"/>
+ <int key="NSBorderType">0</int>
+ <int key="NSBoxType">4</int>
+ <int key="NSTitlePosition">0</int>
+ <bool key="NSTransparent">NO</bool>
+ <reference key="NSFillColor2" ref="524635398"/>
+ </object>
<object class="NSCustomView" id="588745489">
<reference key="NSNextResponder" ref="675542922"/>
<int key="NSvFlags">266</int>
@@ -65,6 +111,7 @@
<int key="NSvFlags">265</int>
<string key="NSFrame">{{411, 5}, {24, 27}}</string>
<reference key="NSSuperview" ref="588745489"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="145095454">
<int key="NSCellFlags">67239424</int>
@@ -97,6 +144,7 @@
<int key="NSvFlags">266</int>
<string key="NSFrame">{{131, 5}, {308, 27}}</string>
<reference key="NSSuperview" ref="588745489"/>
+ <reference key="NSWindow"/>
<int key="NSTag">33004</int>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="971876011">
@@ -139,15 +187,7 @@
<reference key="NSSupport" ref="632923964"/>
<reference key="NSControlView" ref="146626462"/>
<bool key="NSDrawsBackground">YES</bool>
- <object class="NSColor" key="NSBackgroundColor" id="619004855">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">textBackgroundColor</string>
- <object class="NSColor" key="NSColor" id="524635398">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MQA</bytes>
- </object>
- </object>
+ <reference key="NSBackgroundColor" ref="619004855"/>
<reference key="NSTextColor" ref="821614029"/>
</object>
</object>
@@ -156,6 +196,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{102, 4}, {29, 29}}</string>
<reference key="NSSuperview" ref="588745489"/>
+ <reference key="NSWindow"/>
<int key="NSTag">35000</int>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="279099892">
@@ -182,6 +223,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{67, 4}, {31, 29}}</string>
<reference key="NSSuperview" ref="588745489"/>
+ <reference key="NSWindow"/>
<int key="NSTag">33002</int>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="352237189">
@@ -207,6 +249,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{34, 4}, {28, 29}}</string>
<reference key="NSSuperview" ref="588745489"/>
+ <reference key="NSWindow"/>
<int key="NSTag">33001</int>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="616960232">
@@ -233,6 +276,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{6, 4}, {29, 29}}</string>
<reference key="NSSuperview" ref="588745489"/>
+ <reference key="NSWindow"/>
<int key="NSTag">33000</int>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="599914932">
@@ -259,6 +303,7 @@
<int key="NSvFlags">265</int>
<string key="NSFrame">{{439, 4}, {29, 29}}</string>
<reference key="NSSuperview" ref="588745489"/>
+ <reference key="NSWindow"/>
<int key="NSTag">33005</int>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="932073098">
@@ -283,48 +328,21 @@
</object>
<string key="NSFrame">{{0, 322}, {480, 38}}</string>
<reference key="NSSuperview" ref="675542922"/>
+ <reference key="NSWindow"/>
<string key="NSClassName">ToolbarView</string>
</object>
- <object class="NSBox" id="753762894">
+ <object class="NSCustomView" id="995989345">
<reference key="NSNextResponder" ref="675542922"/>
- <int key="NSvFlags">18</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSView" id="250835567">
- <reference key="NSNextResponder" ref="753762894"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrameSize">{480, 322}</string>
- <reference key="NSSuperview" ref="753762894"/>
- </object>
- </object>
- <string key="NSFrameSize">{480, 322}</string>
+ <int key="NSvFlags">289</int>
+ <string key="NSFrame">{{465, 0}, {15, 15}}</string>
<reference key="NSSuperview" ref="675542922"/>
- <string key="NSOffsets">{0, 0}</string>
- <object class="NSTextFieldCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Box</string>
- <object class="NSFont" key="NSSupport">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">1.100000e+01</double>
- <int key="NSfFlags">3100</int>
- </object>
- <reference key="NSBackgroundColor" ref="619004855"/>
- <object class="NSColor" key="NSTextColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes>
- </object>
- </object>
- <reference key="NSContentView" ref="250835567"/>
- <int key="NSBorderType">0</int>
- <int key="NSBoxType">4</int>
- <int key="NSTitlePosition">0</int>
- <bool key="NSTransparent">NO</bool>
- <reference key="NSFillColor2" ref="524635398"/>
+ <reference key="NSWindow"/>
+ <string key="NSClassName">GrowBoxView</string>
</object>
</object>
<string key="NSFrameSize">{480, 360}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{480, 382}</string>
@@ -446,6 +464,14 @@
</object>
<int key="connectionID">169</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">growBox_</string>
+ <reference key="source" ref="326691890"/>
+ <reference key="destination" ref="995989345"/>
+ </object>
+ <int key="connectionID">176</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -487,6 +513,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="588745489"/>
<reference ref="753762894"/>
+ <reference ref="995989345"/>
</object>
<reference key="parent" ref="886393115"/>
</object>
@@ -612,6 +639,14 @@
<object class="IBObjectRecord">
<int key="objectID">164</int>
<reference key="object" ref="753762894"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <reference key="parent" ref="675542922"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">175</int>
+ <reference key="object" ref="995989345"/>
<reference key="parent" ref="675542922"/>
</object>
</object>
@@ -644,6 +679,7 @@
<string>137.IBPluginDependency</string>
<string>138.IBPluginDependency</string>
<string>164.IBPluginDependency</string>
+ <string>175.IBPluginDependency</string>
<string>93.IBEditorWindowLastContentRect</string>
<string>93.IBViewEditorWindowController.showingLayoutRectangles</string>
<string>93.IBWindowTemplateEditedContentRect</string>
@@ -679,9 +715,10 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{523, 153}, {480, 360}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>{{273, 241}, {480, 360}}</string>
<boolean value="YES" id="5"/>
- <string>{{523, 153}, {480, 360}}</string>
+ <string>{{273, 241}, {480, 360}}</string>
<reference ref="5"/>
<reference ref="5"/>
<string>{480, 360}</string>
@@ -709,7 +746,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">169</int>
+ <int key="maxID">176</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -727,6 +764,14 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">GrowBoxView</string>
+ <string key="superclassName">NSView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">browser/cocoa/grow_box_view.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">TabContentsController</string>
<string key="superclassName">NSViewController</string>
<object class="NSMutableDictionary" key="actions">
@@ -740,6 +785,7 @@
<string>backButton_</string>
<string>contentsBox_</string>
<string>forwardButton_</string>
+ <string>growBox_</string>
<string>locationBar_</string>
<string>reloadStopButton_</string>
<string>starButton_</string>
@@ -749,6 +795,7 @@
<string>NSButton</string>
<string>NSBox</string>
<string>NSButton</string>
+ <string>GrowBoxView</string>
<string>NSTextField</string>
<string>NSButton</string>
<string>NSButton</string>
diff --git a/chrome/app/theme/grow_box.png b/chrome/app/theme/grow_box.png
new file mode 100644
index 0000000..8278fec
--- /dev/null
+++ b/chrome/app/theme/grow_box.png
Binary files differ