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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/app/nibs/InfoBar.xib

Issue 155788: Infobar UI cleanup on Mac. Adds the yellow background gradient and... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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/browser/cocoa/infobar_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/nibs/InfoBar.xib
===================================================================
--- chrome/app/nibs/InfoBar.xib (revision 21109)
+++ chrome/app/nibs/InfoBar.xib (working copy)
@@ -42,13 +42,13 @@
<object class="NSTextField" id="293244832">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">258</int>
- <string key="NSFrame">{{53, 7}, {150, 17}}</string>
+ <string key="NSFrame">{{53, 7}, {198, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="963811960">
<int key="NSCellFlags">67239488</int>
<int key="NSCellFlags2">272631808</int>
- <string key="NSContents">This is not an InfoBar</string>
+ <string key="NSContents">InfoBar text</string>
<object class="NSFont" key="NSSupport" id="3997082">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">1.300000e+01</double>
@@ -110,31 +110,75 @@
<object class="NSButton" id="861420161">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">297</int>
- <string key="NSFrame">{{446, 0}, {16, 16}}</string>
+ <string key="NSFrame">{{444, 8}, {16, 16}}</string>
<reference key="NSSuperview" ref="1005"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1030694164">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
- <string key="NSContents">Button</string>
+ <string key="NSContents"/>
<reference key="NSSupport" ref="3997082"/>
<reference key="NSControlView" ref="861420161"/>
- <int key="NSButtonFlags">-2042347265</int>
- <int key="NSButtonFlags2">1</int>
+ <int key="NSButtonFlags">139215103</int>
+ <int key="NSButtonFlags2">6</int>
<object class="NSCustomResource" key="NSNormalImage">
<string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSStopProgressTemplate</string>
+ <string key="NSResourceName">close_bar</string>
</object>
+ <object class="NSCustomResource" key="NSAlternateImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">close_bar_p</string>
+ </object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
+ <object class="NSButton" id="488415728">
+ <reference key="NSNextResponder" ref="1005"/>
+ <int key="NSvFlags">265</int>
+ <string key="NSFrame">{{346, -2}, {96, 32}}</string>
+ <reference key="NSSuperview" ref="1005"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="24619168">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">Cancel</string>
+ <reference key="NSSupport" ref="3997082"/>
+ <reference key="NSControlView" ref="488415728"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
+ <object class="NSButton" id="11488953">
+ <reference key="NSNextResponder" ref="1005"/>
+ <int key="NSvFlags">265</int>
+ <string key="NSFrame">{{250, -2}, {96, 32}}</string>
+ <reference key="NSSuperview" ref="1005"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="900516520">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">OK</string>
+ <reference key="NSSupport" ref="3997082"/>
+ <reference key="NSControlView" ref="11488953"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
</object>
<string key="NSFrameSize">{480, 30}</string>
<reference key="NSSuperview"/>
- <string key="NSClassName">BackgroundGradientView</string>
+ <string key="NSClassName">InfoBarGradientView</string>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -188,6 +232,38 @@
</object>
<int key="connectionID">19</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">cancelButton_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="488415728"/>
+ </object>
+ <int key="connectionID">26</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">okButton_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="11488953"/>
+ </object>
+ <int key="connectionID">27</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">ok:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="11488953"/>
+ </object>
+ <int key="connectionID">28</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">cancel:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="488415728"/>
+ </object>
+ <int key="connectionID">29</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -225,6 +301,8 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="293244832"/>
<reference ref="724203299"/>
+ <reference ref="488415728"/>
+ <reference ref="11488953"/>
<reference ref="861420161"/>
</object>
<reference key="parent" ref="1002"/>
@@ -258,6 +336,34 @@
<reference key="parent" ref="724203299"/>
</object>
<object class="IBObjectRecord">
+ <int key="objectID">20</int>
+ <reference key="object" ref="488415728"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="24619168"/>
+ </object>
+ <reference key="parent" ref="1005"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">21</int>
+ <reference key="object" ref="24619168"/>
+ <reference key="parent" ref="488415728"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">22</int>
+ <reference key="object" ref="11488953"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="900516520"/>
+ </object>
+ <reference key="parent" ref="1005"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">23</int>
+ <reference key="object" ref="900516520"/>
+ <reference key="parent" ref="11488953"/>
+ </object>
+ <object class="IBObjectRecord">
<int key="objectID">15</int>
<reference key="object" ref="861420161"/>
<object class="NSMutableArray" key="children">
@@ -288,6 +394,10 @@
<string>16.IBPluginDependency</string>
<string>2.CustomClassName</string>
<string>2.IBPluginDependency</string>
+ <string>20.IBPluginDependency</string>
+ <string>21.IBPluginDependency</string>
+ <string>22.IBPluginDependency</string>
+ <string>23.IBPluginDependency</string>
<string>3.IBPluginDependency</string>
<string>4.IBPluginDependency</string>
<string>5.IBPluginDependency</string>
@@ -308,6 +418,10 @@
<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>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -330,39 +444,46 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">19</int>
+ <int key="maxID">29</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
- <string key="className">BackgroundGradientView</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">browser/cocoa/background_gradient_view.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">InfoBarController</string>
<string key="superclassName">NSViewController</string>
<object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">dismiss:</string>
- <string key="NS.object.0">id</string>
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>cancel:</string>
+ <string>dismiss:</string>
+ <string>ok:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <string>cancelButton_</string>
<string>closeButton_</string>
<string>image_</string>
<string>label_</string>
+ <string>okButton_</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSButton</string>
+ <string>NSButton</string>
<string>NSImageView</string>
<string>NSTextField</string>
+ <string>NSButton</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -371,6 +492,14 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">InfoBarGradientView</string>
+ <string key="superclassName">NSView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">browser/cocoa/infobar_gradient_view.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">InfoBarTextField</string>
<string key="superclassName">NSTextField</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
« no previous file with comments | « no previous file | chrome/browser/cocoa/infobar_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698