diff options
author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-23 16:37:13 +0000 |
---|---|---|
committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-23 16:37:13 +0000 |
commit | 52a63f4d1c139345fb3fe0bc294ab27abfcd6db8 (patch) | |
tree | 033fe46019059f06d7b14990f45350543d713a84 /chrome/app/nibs | |
parent | f15a3b036835167385507265692b626969b305f1 (diff) | |
download | chromium_src-52a63f4d1c139345fb3fe0bc294ab27abfcd6db8.zip chromium_src-52a63f4d1c139345fb3fe0bc294ab27abfcd6db8.tar.gz chromium_src-52a63f4d1c139345fb3fe0bc294ab27abfcd6db8.tar.bz2 |
Implement side tab view and controller and hook up their creation. Parameterize tab strip layout so it can be vertical in addition to horizontal without breaking up the code too much. Abstracted some of the side tab knowledge into TabWindowController with overrides in BrowserWindowController.
Nib change: added a SideTabStripView custom view to BrowserWindow and hooked it to an outlet. Renamed the outlets to better reflect both views.
BUG=44773
TEST=Tab layout, full screen, dragging tabs within and to other windows to make sure they reflow and draw correctly. Side tabs themselves are still behind a flag, but this cl touches many normal codepaths.
Review URL: http://codereview.chromium.org/2846028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50606 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/nibs')
-rw-r--r-- | chrome/app/nibs/BrowserWindow.xib | 96 |
1 files changed, 76 insertions, 20 deletions
diff --git a/chrome/app/nibs/BrowserWindow.xib b/chrome/app/nibs/BrowserWindow.xib index 4d5564a..4345d67 100644 --- a/chrome/app/nibs/BrowserWindow.xib +++ b/chrome/app/nibs/BrowserWindow.xib @@ -2,14 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9L30</string> - <string key="IBDocument.InterfaceBuilderVersion">680</string> + <string key="IBDocument.SystemVersion">9L31a</string> + <string key="IBDocument.InterfaceBuilderVersion">677</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="56"/> - <integer value="1"/> + <integer value="89"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -46,7 +45,7 @@ <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{400, 250}</string> <object class="NSView" key="NSWindowView" id="1006"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -59,14 +58,13 @@ </object> </object> <string key="NSFrameSize">{750, 600}</string> - <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMinSize">{400, 272}</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> @@ -96,9 +94,15 @@ </object> </object> <string key="NSFrameSize">{483, 36}</string> - <reference key="NSSuperview"/> <string key="NSClassName">TabStripView</string> </object> + <object class="NSCustomView" id="529166964"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">272</int> + <string key="NSFrameSize">{236, 393}</string> + <reference key="NSSuperview"/> + <string key="NSClassName">SideTabStripView</string> + </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> <object class="NSMutableArray" key="connectionRecords"> @@ -121,14 +125,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">tabStripView_</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="1029219716"/> - </object> - <int key="connectionID">65</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">tabContentArea_</string> <reference key="source" ref="1001"/> <reference key="destination" ref="1858870"/> @@ -143,6 +139,22 @@ </object> <int key="connectionID">87</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">topTabStripView_</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="1029219716"/> + </object> + <int key="connectionID">88</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">sideTabStripView_</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="529166964"/> + </object> + <int key="connectionID">90</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -221,6 +233,11 @@ <reference key="object" ref="1858870"/> <reference key="parent" ref="1006"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">89</int> + <reference key="object" ref="529166964"/> + <reference key="parent" ref="490739442"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -248,6 +265,8 @@ <string>66.IBPluginDependency</string> <string>67.IBPluginDependency</string> <string>84.IBPluginDependency</string> + <string>89.IBEditorWindowLastContentRect</string> + <string>89.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -275,6 +294,8 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{89, 611}, {236, 393}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -297,7 +318,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">87</int> + <int key="maxID">90</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -311,9 +332,16 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">BrowserWindowController</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/browser_window_controller_private.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">ChromeBrowserWindow</string> <string key="superclassName">ChromeEventProcessingWindow</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="924273615"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">browser/cocoa/chrome_browser_window.h</string> </object> @@ -350,6 +378,20 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../third_party/GTM/Foundation/GTMNSObject+KeyValueObserving.h</string> + </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/objc_zombie.h</string> + </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/status_bubble_mac.h</string> </object> </object> @@ -362,9 +404,21 @@ </object> <object class="IBPartialClassDescription"> <string key="className">NSWindow</string> + <reference key="sourceIdentifier" ref="924273615"/> + </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> + <string key="minorKey">browser/cocoa/themed_window.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">SideTabStripView</string> + <string key="superclassName">TabStripView</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/side_tab_strip_view.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -386,11 +440,13 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>sideTabStripView_</string> <string>tabContentArea_</string> - <string>tabStripView_</string> + <string>topTabStripView_</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>TabStripView</string> <string>FastResizeView</string> <string>TabStripView</string> </object> |