diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-12 20:38:45 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-12 20:38:45 +0000 |
| commit | b7759e80dbbf1ccc1ba6b6f74114c45740d8bcc7 (patch) | |
| tree | 2fd15f287494b03f5bec84c96dec356e3e6ab2c3 /chrome/app | |
| parent | e3004debf8335781c583f63035872520a75978a3 (diff) | |
| download | chromium_src-b7759e80dbbf1ccc1ba6b6f74114c45740d8bcc7.zip chromium_src-b7759e80dbbf1ccc1ba6b6f74114c45740d8bcc7.tar.gz chromium_src-b7759e80dbbf1ccc1ba6b6f74114c45740d8bcc7.tar.bz2 | |
Don't rely on subview ordering to be equivalent to tab ordering. Allows us to correctly set z-order on tabs. Add animation to tabs closing. Fix issue where new tab button would not draw correctly by pulling it from the nib. Fix memory leak in TabController. Fix console output about missing image.
Review URL: http://codereview.chromium.org/43144
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11575 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/nibs/en.lproj/BrowserWindow.xib | 60 | ||||
| -rw-r--r-- | chrome/app/nibs/en.lproj/TabView.xib | 6 |
2 files changed, 58 insertions, 8 deletions
diff --git a/chrome/app/nibs/en.lproj/BrowserWindow.xib b/chrome/app/nibs/en.lproj/BrowserWindow.xib index 42a88a2..eb76ef9 100644 --- a/chrome/app/nibs/en.lproj/BrowserWindow.xib +++ b/chrome/app/nibs/en.lproj/BrowserWindow.xib @@ -8,7 +8,7 @@ <string key="IBDocument.HIToolboxVersion">352.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="1"/> + <integer value="56"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -44,7 +44,7 @@ <nil key="NSViewClass"/> <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</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> @@ -94,15 +94,46 @@ </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"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">266</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="131944810"> + <reference key="NSNextResponder" ref="1029219716"/> + <int key="NSvFlags">-2147483348</int> + <string key="NSFrame">{{295, 0}, {40, 27}}</string> + <reference key="NSSuperview" ref="1029219716"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="517448702"> + <int key="NSCellFlags">-2080244224</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents"/> + <object class="NSFont" key="NSSupport"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">1.300000e+01</double> + <int key="NSfFlags">1044</int> + </object> + <reference key="NSControlView" ref="131944810"/> + <int key="NSButtonFlags">138690815</int> + <int key="NSButtonFlags2">134</int> + <object class="NSCustomResource" key="NSNormalImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">newtab</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + </object> + </object> + </object> <string key="NSFrameSize">{483, 25}</string> + <reference key="NSSuperview"/> <string key="NSClassName">TabStripView</string> </object> </object> @@ -200,10 +231,25 @@ <reference key="object" ref="1029219716"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="131944810"/> </object> <reference key="parent" ref="1002"/> <string key="objectName">TabBar</string> </object> + <object class="IBObjectRecord"> + <int key="objectID">66</int> + <reference key="object" ref="131944810"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="517448702"/> + </object> + <reference key="parent" ref="1029219716"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">67</int> + <reference key="object" ref="517448702"/> + <reference key="parent" ref="131944810"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -227,6 +273,8 @@ <string>55.IBPluginDependency</string> <string>56.IBEditorWindowLastContentRect</string> <string>56.IBPluginDependency</string> + <string>66.IBPluginDependency</string> + <string>67.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -250,6 +298,8 @@ <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> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -272,7 +322,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">65</int> + <int key="maxID">67</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> diff --git a/chrome/app/nibs/en.lproj/TabView.xib b/chrome/app/nibs/en.lproj/TabView.xib index 48fd1c8..4b5a3ca 100644 --- a/chrome/app/nibs/en.lproj/TabView.xib +++ b/chrome/app/nibs/en.lproj/TabView.xib @@ -8,7 +8,7 @@ <string key="IBDocument.HIToolboxVersion">352.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="17"/> + <integer value="18"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -47,7 +47,7 @@ <reference key="NSSuperview" ref="1005"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="707804163"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">-2080244224</int> <int key="NSCellFlags2">0</int> <string key="NSContents">Label</string> <object class="NSFont" key="NSSupport"> @@ -60,7 +60,7 @@ <int key="NSButtonFlags2">134</int> <object class="NSCustomResource" key="NSNormalImage"> <string key="NSClassName">NSImage</string> - <string key="NSResourceName">gmail</string> + <string key="NSResourceName">nav</string> </object> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> |