Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3173)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/app/nibs/en.lproj/BrowserWindow.xib

Issue 65011: Flatten down to a single toolbar per window, significantly simplifying the ta... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/app/nibs/en.lproj/TabContents.xib » ('j') | chrome/browser/cocoa/tab_window_controller.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/nibs/en.lproj/BrowserWindow.xib
===================================================================
--- chrome/app/nibs/en.lproj/BrowserWindow.xib (revision 13420)
+++ chrome/app/nibs/en.lproj/BrowserWindow.xib (working copy)
@@ -8,7 +8,7 @@
<string key="IBDocument.HIToolboxVersion">352.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="56"/>
+ <integer value="2"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -44,62 +44,26 @@
<nil key="NSViewClass"/>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<object class="NSView" key="NSWindowView" id="1006">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSBox" id="332491870">
+ <object class="NSCustomView" id="1858870">
<reference key="NSNextResponder" ref="1006"/>
- <int key="NSvFlags">18</int>
- <object class="NSMutableArray" key="NSSubviews">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSView" id="734052543">
- <reference key="NSNextResponder" ref="332491870"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrameSize">{750, 586}</string>
- <reference key="NSSuperview" ref="332491870"/>
- </object>
- </object>
+ <int key="NSvFlags">274</int>
<string key="NSFrameSize">{750, 586}</string>
<reference key="NSSuperview" ref="1006"/>
- <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">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">textBackgroundColor</string>
- <object class="NSColor" key="NSColor">
- <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="734052543"/>
- <int key="NSBorderType">0</int>
- <int key="NSBoxType">4</int>
- <int key="NSTitlePosition">0</int>
- <bool key="NSTransparent">NO</bool>
+ <string key="NSClassName">NSView</string>
</object>
</object>
<string key="NSFrameSize">{750, 600}</string>
+ <reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<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>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -133,7 +97,6 @@
</object>
</object>
<string key="NSFrameSize">{483, 25}</string>
- <reference key="NSSuperview"/>
<string key="NSClassName">TabStripView</string>
</object>
</object>
@@ -158,19 +121,19 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">contentBox_</string>
+ <string key="label">tabStripView_</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="332491870"/>
+ <reference key="destination" ref="1029219716"/>
</object>
- <int key="connectionID">63</int>
+ <int key="connectionID">65</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">tabStripView_</string>
+ <string key="label">tabContentArea_</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="1029219716"/>
+ <reference key="destination" ref="1858870"/>
</object>
- <int key="connectionID">65</int>
+ <int key="connectionID">86</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -217,16 +180,11 @@
<reference key="object" ref="1006"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="332491870"/>
+ <reference ref="1858870"/>
</object>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">55</int>
- <reference key="object" ref="332491870"/>
- <reference key="parent" ref="1006"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">56</int>
<reference key="object" ref="1029219716"/>
<object class="NSMutableArray" key="children">
@@ -250,6 +208,11 @@
<reference key="object" ref="517448702"/>
<reference key="parent" ref="131944810"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">84</int>
+ <reference key="object" ref="1858870"/>
+ <reference key="parent" ref="1006"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -270,11 +233,11 @@
<string>2.IBViewIntegration.shadowColor</string>
<string>2.IBViewIntegration.shadowOffsetHeight</string>
<string>2.IBViewIntegration.shadowOffsetWidth</string>
- <string>55.IBPluginDependency</string>
<string>56.IBEditorWindowLastContentRect</string>
<string>56.IBPluginDependency</string>
<string>66.IBPluginDependency</string>
<string>67.IBPluginDependency</string>
+ <string>84.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -295,11 +258,11 @@
</object>
<real value="0.000000e+00"/>
<real value="0.000000e+00"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{160, 204}, {483, 25}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -322,31 +285,14 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">67</int>
+ <int key="maxID">86</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
<string key="className">BrowserWindowController</string>
- <string key="superclassName">NSWindowController</string>
- <object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>contentBox_</string>
- <string>tabStripView_</string>
- <string>toolbarView_</string>
- <string>urlBarView_</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSBox</string>
- <string>TabStripView</string>
- <string>NSView</string>
- <string>NSTextField</string>
- </object>
- </object>
+ <string key="superclassName">TabWindowController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">browser/cocoa/browser_window_controller.h</string>
@@ -365,6 +311,13 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">browser/cocoa/tab_strip_model_observer_bridge.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">TabStripView</string>
<string key="superclassName">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -372,6 +325,27 @@
<string key="minorKey">browser/cocoa/tab_strip_view.h</string>
</object>
</object>
+ <object class="IBPartialClassDescription">
+ <string key="className">TabWindowController</string>
+ <string key="superclassName">NSWindowController</string>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>tabContentArea_</string>
+ <string>tabStripView_</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSView</string>
+ <string>TabStripView</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">browser/cocoa/tab_window_controller.h</string>
+ </object>
+ </object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
« no previous file with comments | « no previous file | chrome/app/nibs/en.lproj/TabContents.xib » ('j') | chrome/browser/cocoa/tab_window_controller.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698