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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7981035: Add icon to the panel titlebar on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Created 9 years, 3 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/ui/panels/panel_titlebar_view_cocoa.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/nibs/Panel.xib
diff --git a/chrome/app/nibs/Panel.xib b/chrome/app/nibs/Panel.xib
index 14ef2a214b162f298d60f46d917c6bd6a0aa89bd..b94277c017c27eb91d3e95f7506e686242e5b46b 100644
--- a/chrome/app/nibs/Panel.xib
+++ b/chrome/app/nibs/Panel.xib
@@ -2,18 +2,18 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10K549</string>
- <string key="IBDocument.InterfaceBuilderVersion">804</string>
- <string key="IBDocument.AppKitVersion">1038.36</string>
+ <string key="IBDocument.SystemVersion">10J869</string>
+ <string key="IBDocument.InterfaceBuilderVersion">851</string>
+ <string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">804</string>
+ <string key="NS.object.0">851</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="6"/>
<integer value="1"/>
+ <integer value="6"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -65,7 +65,7 @@
<object class="NSButton" id="514167085">
<reference key="NSNextResponder" ref="304499912"/>
<int key="NSvFlags">297</int>
- <string key="NSFrame">{{280, 3}, {14, 14}}</string>
+ <string key="NSFrame">{{278, 4}, {14, 14}}</string>
<reference key="NSSuperview" ref="304499912"/>
<bool key="NSViewIsLayerTreeHost">YES</bool>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
@@ -90,13 +90,13 @@
</object>
<object class="NSTextField" id="537532822">
<reference key="NSNextResponder" ref="304499912"/>
- <int key="NSvFlags">298</int>
+ <int key="NSvFlags">301</int>
<string key="NSFrame">{{26, 5}, {248, 14}}</string>
<reference key="NSSuperview" ref="304499912"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="947097847">
<int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">138548224</int>
+ <int key="NSCellFlags2">4330560</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="537532822"/>
@@ -120,6 +120,35 @@
</object>
</object>
</object>
+ <object class="NSImageView" id="542139912">
+ <reference key="NSNextResponder" ref="304499912"/>
+ <int key="NSvFlags">301</int>
+ <object class="NSMutableSet" key="NSDragTypes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="set.sortedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>Apple PDF pasteboard type</string>
+ <string>Apple PICT pasteboard type</string>
+ <string>Apple PNG pasteboard type</string>
+ <string>NSFilenamesPboardType</string>
+ <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+ <string>NeXT TIFF v4.0 pasteboard type</string>
+ </object>
+ </object>
+ <string key="NSFrame">{{126, 3}, {14, 14}}</string>
+ <reference key="NSSuperview" ref="304499912"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSImageCell" key="NSCell" id="966884311">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">33685504</int>
+ <reference key="NSSupport" ref="26"/>
+ <int key="NSAlign">0</int>
+ <int key="NSScale">0</int>
+ <int key="NSStyle">0</int>
+ <bool key="NSAnimates">NO</bool>
+ </object>
+ <bool key="NSEditable">YES</bool>
+ </object>
</object>
<string key="NSFrameSize">{300, 22}</string>
<reference key="NSSuperview"/>
@@ -193,6 +222,14 @@
</object>
<int key="connectionID">18</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">icon_</string>
+ <reference key="source" ref="304499912"/>
+ <reference key="destination" ref="542139912"/>
+ </object>
+ <int key="connectionID">21</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -242,6 +279,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="537532822"/>
<reference ref="514167085"/>
+ <reference ref="542139912"/>
</object>
<reference key="parent" ref="0"/>
<string key="objectName">PanelTitlebarView</string>
@@ -274,6 +312,20 @@
<reference key="object" ref="730890819"/>
<reference key="parent" ref="514167085"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">19</int>
+ <reference key="object" ref="542139912"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="966884311"/>
+ </object>
+ <reference key="parent" ref="304499912"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">20</int>
+ <reference key="object" ref="966884311"/>
+ <reference key="parent" ref="542139912"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -295,7 +347,9 @@
<string>13.IBPluginDependency</string>
<string>13.IBViewBoundsToFrameTransform</string>
<string>14.IBPluginDependency</string>
+ <string>19.IBPluginDependency</string>
<string>2.IBPluginDependency</string>
+ <string>20.IBPluginDependency</string>
<string>6.IBEditorWindowLastContentRect</string>
<string>6.IBPluginDependency</string>
</object>
@@ -304,9 +358,9 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{1361, 387}, {480, 270}}</string>
+ <string>{{995, 387}, {480, 270}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{1361, 387}, {480, 270}}</string>
+ <string>{{995, 387}, {480, 270}}</string>
<boolean value="NO"/>
<string>{196, 240}</string>
<string>{{357, 418}, {480, 270}}</string>
@@ -319,6 +373,8 @@
</object>
<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>{{892, 701}, {300, 22}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
@@ -339,17 +395,17 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">18</int>
+ <int key="maxID">21</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>
+ <string key="className">ChromeEventProcessingWindow</string>
+ <string key="superclassName">NSWindow</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">browser/ui/cocoa/background_gradient_view.h</string>
+ <string key="minorKey">browser/ui/cocoa/chrome_event_processing_window.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -452,7 +508,7 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">PanelTitlebarViewCocoa</string>
- <string key="superclassName">BackgroundGradientView</string>
+ <string key="superclassName">NSView</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
@@ -490,12 +546,14 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>controller_</string>
+ <string>icon_</string>
<string>settingsButton_</string>
<string>title_</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>PanelWindowControllerCocoa</string>
+ <string>NSImageView</string>
<string>HoverImageButton</string>
<string>NSTextField</string>
</object>
@@ -505,6 +563,7 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>controller_</string>
+ <string>icon_</string>
<string>settingsButton_</string>
<string>title_</string>
</object>
@@ -515,6 +574,10 @@
<string key="candidateClassName">PanelWindowControllerCocoa</string>
</object>
<object class="IBToOneOutletInfo">
+ <string key="name">icon_</string>
+ <string key="candidateClassName">NSImageView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
<string key="name">settingsButton_</string>
<string key="candidateClassName">HoverImageButton</string>
</object>
@@ -531,7 +594,7 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">PanelWindowCocoaImpl</string>
- <string key="superclassName">NSWindow</string>
+ <string key="superclassName">ThemedBrowserWindow</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="445655532">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">browser/ui/panels/panel_window_controller_cocoa.h</string>
@@ -561,6 +624,14 @@
<string key="minorKey"/>
</object>
</object>
+ <object class="IBPartialClassDescription">
+ <string key="className">ThemedBrowserWindow</string>
+ <string key="superclassName">ChromeEventProcessingWindow</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">browser/ui/cocoa/themed_browser_window.h</string>
+ </object>
+ </object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -649,6 +720,22 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">NSImageCell</string>
+ <string key="superclassName">NSCell</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">AppKit.framework/Headers/NSImageCell.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSImageView</string>
+ <string key="superclassName">NSControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">AppKit.framework/Headers/NSImageView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">NSMenu</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="1041586315">
« no previous file with comments | « no previous file | chrome/browser/ui/panels/panel_titlebar_view_cocoa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698