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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 159060: Use a real download item.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: first round of review comments addressed 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/app/nibs/DownloadShelf.xib » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/nibs/DownloadItem.xib
===================================================================
--- chrome/app/nibs/DownloadItem.xib (revision 21145)
+++ chrome/app/nibs/DownloadItem.xib (working copy)
@@ -8,8 +8,8 @@
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="24"/>
- <integer value="4"/>
+ <integer value="1"/>
+ <integer value="28"/>
<integer value="13"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
@@ -38,88 +38,35 @@
</object>
<object class="NSCustomView" id="1005">
<reference key="NSNextResponder"/>
- <int key="NSvFlags">268</int>
+ <int key="NSvFlags">292</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSPopUpButton" id="690119733">
+ <object class="NSButton" id="575090266">
<reference key="NSNextResponder" ref="1005"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{0, 3}, {200, 26}}</string>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrameSize">{200, 34}</string>
<reference key="NSSuperview" ref="1005"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="750218797">
- <int key="NSCellFlags">-2076049856</int>
- <int key="NSCellFlags2">134219776</int>
+ <object class="NSButtonCell" key="NSCell" id="966513665">
+ <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">Button</string>
<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="690119733"/>
- <int key="NSButtonFlags">-2035269377</int>
- <int key="NSButtonFlags2">129</int>
- <object class="NSImage" key="NSNormalImage">
- <int key="NSImageFlags">549650432</int>
- <string key="NSSize">{1, 1}</string>
- <object class="NSMutableArray" key="NSReps">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="0"/>
- <object class="NSBitmapImageRep">
- <object class="NSData" key="NSTIFFRepresentation">
- <bytes key="NS.bytes">TU0AKgAAAAoAAAANAQAAAwAAAAEAAQAAAQEAAwAAAAEAAQAAAQIAAwAAAAIACAAIAQMAAwAAAAEAAQAA
-AQYAAwAAAAEAAQAAAREABAAAAAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEQAAAA
-ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
- </object>
- </object>
- </object>
- </object>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MCAwAA</bytes>
- </object>
- </object>
+ <reference key="NSControlView" ref="575090266"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">162</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="593643111">
- <reference key="NSMenu" ref="672782413"/>
- <bool key="NSIsHidden">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <object class="NSCustomResource" key="NSOnImage" id="503301017">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuCheckmark</string>
- </object>
- <object class="NSCustomResource" key="NSMixedImage" id="246735032">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuMixedState</string>
- </object>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="750218797"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="672782413">
- <string key="NSTitle">Unused</string>
- <object class="NSMutableArray" key="NSMenuItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="593643111"/>
- </object>
- </object>
- <int key="NSSelectedIndex">-1</int>
- <bool key="NSPullDown">YES</bool>
- <int key="NSPreferredEdge">1</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">2</int>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
</object>
</object>
</object>
- <string key="NSFrameSize">{200, 32}</string>
+ <string key="NSFrameSize">{200, 34}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
@@ -134,8 +81,14 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="503301017"/>
- <reference key="NSMixedImage" ref="246735032"/>
+ <object class="NSCustomResource" key="NSOnImage" id="948795975">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuCheckmark</string>
+ </object>
+ <object class="NSCustomResource" key="NSMixedImage" id="423932028">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuMixedState</string>
+ </object>
<string key="NSAction">_popUpItemAction:</string>
</object>
<object class="NSMenuItem" id="770771657">
@@ -144,8 +97,8 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="503301017"/>
- <reference key="NSMixedImage" ref="246735032"/>
+ <reference key="NSOnImage" ref="948795975"/>
+ <reference key="NSMixedImage" ref="423932028"/>
<string key="NSAction">_popUpItemAction:</string>
</object>
<object class="NSMenuItem" id="530126839">
@@ -154,8 +107,8 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="503301017"/>
- <reference key="NSMixedImage" ref="246735032"/>
+ <reference key="NSOnImage" ref="948795975"/>
+ <reference key="NSMixedImage" ref="423932028"/>
<string key="NSAction">_popUpItemAction:</string>
</object>
<object class="NSMenuItem" id="812951457">
@@ -165,8 +118,8 @@
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="503301017"/>
- <reference key="NSMixedImage" ref="246735032"/>
+ <reference key="NSOnImage" ref="948795975"/>
+ <reference key="NSMixedImage" ref="423932028"/>
</object>
<object class="NSMenuItem" id="191249624">
<reference key="NSMenu" ref="571207526"/>
@@ -174,8 +127,8 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="503301017"/>
- <reference key="NSMixedImage" ref="246735032"/>
+ <reference key="NSOnImage" ref="948795975"/>
+ <reference key="NSMixedImage" ref="423932028"/>
<string key="NSAction">_popUpItemAction:</string>
</object>
<object class="NSMenuItem" id="285298090">
@@ -185,8 +138,8 @@
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="503301017"/>
- <reference key="NSMixedImage" ref="246735032"/>
+ <reference key="NSOnImage" ref="948795975"/>
+ <reference key="NSMixedImage" ref="423932028"/>
</object>
<object class="NSMenuItem" id="693025028">
<reference key="NSMenu" ref="571207526"/>
@@ -194,8 +147,8 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="503301017"/>
- <reference key="NSMixedImage" ref="246735032"/>
+ <reference key="NSOnImage" ref="948795975"/>
+ <reference key="NSMixedImage" ref="423932028"/>
<string key="NSAction">_popUpItemAction:</string>
</object>
</object>
@@ -211,8 +164,8 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="503301017"/>
- <reference key="NSMixedImage" ref="246735032"/>
+ <reference key="NSOnImage" ref="948795975"/>
+ <reference key="NSMixedImage" ref="423932028"/>
<string key="NSAction">_popUpItemAction:</string>
</object>
<object class="NSMenuItem" id="514660119">
@@ -221,8 +174,8 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="503301017"/>
- <reference key="NSMixedImage" ref="246735032"/>
+ <reference key="NSOnImage" ref="948795975"/>
+ <reference key="NSMixedImage" ref="423932028"/>
<string key="NSAction">_popUpItemAction:</string>
</object>
<object class="NSMenuItem" id="769910664">
@@ -231,8 +184,8 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="503301017"/>
- <reference key="NSMixedImage" ref="246735032"/>
+ <reference key="NSOnImage" ref="948795975"/>
+ <reference key="NSMixedImage" ref="423932028"/>
<string key="NSAction">_popUpItemAction:</string>
</object>
<object class="NSMenuItem" id="858143630">
@@ -242,8 +195,8 @@
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="503301017"/>
- <reference key="NSMixedImage" ref="246735032"/>
+ <reference key="NSOnImage" ref="948795975"/>
+ <reference key="NSMixedImage" ref="423932028"/>
</object>
<object class="NSMenuItem" id="434679781">
<reference key="NSMenu" ref="231354576"/>
@@ -251,8 +204,8 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="503301017"/>
- <reference key="NSMixedImage" ref="246735032"/>
+ <reference key="NSOnImage" ref="948795975"/>
+ <reference key="NSMixedImage" ref="423932028"/>
<string key="NSAction">_popUpItemAction:</string>
</object>
<object class="NSMenuItem" id="158646227">
@@ -262,8 +215,8 @@
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="503301017"/>
- <reference key="NSMixedImage" ref="246735032"/>
+ <reference key="NSOnImage" ref="948795975"/>
+ <reference key="NSMixedImage" ref="423932028"/>
</object>
<object class="NSMenuItem" id="93640760">
<reference key="NSMenu" ref="231354576"/>
@@ -271,8 +224,8 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="503301017"/>
- <reference key="NSMixedImage" ref="246735032"/>
+ <reference key="NSOnImage" ref="948795975"/>
+ <reference key="NSMixedImage" ref="423932028"/>
<string key="NSAction">_popUpItemAction:</string>
</object>
</object>
@@ -283,14 +236,6 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">popupButton_</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="690119733"/>
- </object>
- <int key="connectionID">12</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">completeDownloadMenu_</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="571207526"/>
@@ -377,6 +322,30 @@
</object>
<int key="connectionID">43</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">progressView_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="575090266"/>
+ </object>
+ <int key="connectionID">61</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">handleButtonClick:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="575090266"/>
+ </object>
+ <int key="connectionID">62</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">cell_</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="966513665"/>
+ </object>
+ <int key="connectionID">63</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -412,43 +381,11 @@
<reference key="object" ref="1005"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="690119733"/>
+ <reference ref="575090266"/>
</object>
<reference key="parent" ref="1002"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">2</int>
- <reference key="object" ref="690119733"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="750218797"/>
- </object>
- <reference key="parent" ref="1005"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">3</int>
- <reference key="object" ref="750218797"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="672782413"/>
- </object>
- <reference key="parent" ref="690119733"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">4</int>
- <reference key="object" ref="672782413"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="593643111"/>
- </object>
- <reference key="parent" ref="750218797"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">8</int>
- <reference key="object" ref="593643111"/>
- <reference key="parent" ref="672782413"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">13</int>
<reference key="object" ref="571207526"/>
<object class="NSMutableArray" key="children">
@@ -548,6 +485,20 @@
<reference key="object" ref="514660119"/>
<reference key="parent" ref="231354576"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">59</int>
+ <reference key="object" ref="575090266"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="966513665"/>
+ </object>
+ <reference key="parent" ref="1005"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">60</int>
+ <reference key="object" ref="966513665"/>
+ <reference key="parent" ref="575090266"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -569,7 +520,6 @@
<string>17.IBPluginDependency</string>
<string>18.IBPluginDependency</string>
<string>19.IBPluginDependency</string>
- <string>2.IBPluginDependency</string>
<string>20.IBPluginDependency</string>
<string>24.IBEditorWindowLastContentRect</string>
<string>24.IBPluginDependency</string>
@@ -578,19 +528,18 @@
<string>27.IBPluginDependency</string>
<string>28.IBPluginDependency</string>
<string>29.IBPluginDependency</string>
- <string>3.IBPluginDependency</string>
<string>30.IBPluginDependency</string>
<string>31.IBPluginDependency</string>
- <string>4.IBEditorWindowLastContentRect</string>
- <string>4.IBPluginDependency</string>
- <string>8.IBPluginDependency</string>
+ <string>59.IBPluginDependency</string>
+ <string>60.CustomClassName</string>
+ <string>60.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{348, 715}, {200, 32}}</string>
+ <string>{{348, 713}, {200, 34}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{628, 654}</string>
<string>{{357, 416}, {480, 272}}</string>
@@ -603,8 +552,8 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>{{52, 549}, {227, 123}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{337, 621}, {227, 123}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -613,10 +562,8 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>DownloadItemCell</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{337, 721}, {200, 23}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -639,12 +586,24 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">43</int>
+ <int key="maxID">63</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
+ <string key="className">DownloadItemCell</string>
+ <string key="superclassName">NSButtonCell</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">updateTrackingAreas:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">browser/cocoa/download_item_cell.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">DownloadItemController</string>
<string key="superclassName">NSViewController</string>
<object class="NSMutableDictionary" key="actions">
@@ -652,6 +611,7 @@
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>handleAlwaysOpen:</string>
+ <string>handleButtonClick:</string>
<string>handleCancel:</string>
<string>handleOpen:</string>
<string>handleReveal:</string>
@@ -662,6 +622,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
@@ -669,14 +630,16 @@
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>activeDownloadMenu_</string>
+ <string>cell_</string>
<string>completeDownloadMenu_</string>
- <string>popupButton_</string>
+ <string>progressView_</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSMenu</string>
+ <string>DownloadItemCell</string>
<string>NSMenu</string>
- <string>NSPopUpButton</string>
+ <string>NSButton</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
« no previous file with comments | « no previous file | chrome/app/nibs/DownloadShelf.xib » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698