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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11103042: New custom styling for action box menu on Os X. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Check that icon exists before setting it. Created 8 years, 2 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/cocoa/base_bubble_controller.mm » ('j') | chrome/browser/ui/cocoa/info_bubble_view.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/nibs/ActionBoxMenuItem.xib
diff --git a/chrome/app/nibs/AvatarMenuItem.xib b/chrome/app/nibs/ActionBoxMenuItem.xib
similarity index 59%
copy from chrome/app/nibs/AvatarMenuItem.xib
copy to chrome/app/nibs/ActionBoxMenuItem.xib
index c84fb3ee3cb16a4455767800595ce7d218bb9f15..43ffba05e207c6390c948fd475b0dca8350c5987 100644
--- a/chrome/app/nibs/AvatarMenuItem.xib
+++ b/chrome/app/nibs/ActionBoxMenuItem.xib
@@ -1,19 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
- <int key="IBDocument.SystemTarget">1070</int>
- <string key="IBDocument.SystemVersion">12B19</string>
+ <int key="IBDocument.SystemTarget">1060</int>
+ <string key="IBDocument.SystemVersion">12C54</string>
<string key="IBDocument.InterfaceBuilderVersion">2549</string>
- <string key="IBDocument.AppKitVersion">1187</string>
- <string key="IBDocument.HIToolboxVersion">624.00</string>
+ <string key="IBDocument.AppKitVersion">1187.34</string>
+ <string key="IBDocument.HIToolboxVersion">625.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">2549</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSButton</string>
- <string>NSButtonCell</string>
<string>NSCustomObject</string>
<string>NSCustomView</string>
<string>NSImageCell</string>
@@ -32,7 +30,7 @@
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSCustomObject" id="1001">
- <string key="NSClassName">AvatarMenuItemController</string>
+ <string key="NSClassName">ActionBoxMenuItemController</string>
</object>
<object class="NSCustomObject" id="1003">
<string key="NSClassName">FirstResponder</string>
@@ -45,46 +43,24 @@
<int key="NSvFlags">290</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSButton" id="520854825">
+ <object class="NSTextField" id="436994758">
<reference key="NSNextResponder" ref="1005"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{49, 8}, {120, 16}}</string>
+ <int key="NSvFlags">266</int>
+ <string key="NSFrame">{{39, 6}, {126, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="909176510">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">^IDS_PROFILES_EDIT_PROFILE_LINK</string>
- <object class="NSFont" key="NSSupport" id="541332804">
+ <object class="NSTextFieldCell" key="NSCell" id="217181972">
+ <int key="NSCellFlags">67108928</int>
+ <int key="NSCellFlags2">272631808</int>
+ <string key="NSContents">Menu Text</string>
+ <object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">12</double>
<int key="NSfFlags">16</int>
</object>
- <reference key="NSControlView" ref="520854825"/>
- <int key="NSButtonFlags">-2046672896</int>
- <int key="NSButtonFlags2">134</int>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSTextField" id="441443194">
- <reference key="NSNextResponder" ref="1005"/>
- <int key="NSvFlags">266</int>
- <string key="NSFrame">{{49, 8}, {120, 16}}</string>
- <reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="309690559">
- <int key="NSCellFlags">67108928</int>
- <int key="NSCellFlags2">272631808</int>
- <string key="NSContents">email@example.com</string>
- <reference key="NSSupport" ref="541332804"/>
- <reference key="NSControlView" ref="441443194"/>
- <object class="NSColor" key="NSBackgroundColor" id="814442900">
+ <reference key="NSControlView" ref="436994758"/>
+ <object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlColor</string>
@@ -95,65 +71,6 @@
</object>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC41AA</bytes>
- </object>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- <object class="NSImageView" id="416344038">
- <reference key="NSNextResponder" ref="1005"/>
- <int key="NSvFlags">268</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">{{28, 5}, {16, 16}}</string>
- <reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSImageCell" key="NSCell" id="857899611">
- <int key="NSCellFlags">134217728</int>
- <int key="NSCellFlags2">33554432</int>
- <object class="NSCustomResource" key="NSContents">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSLockLockedTemplate</string>
- </object>
- <int key="NSAlign">0</int>
- <int key="NSScale">0</int>
- <int key="NSStyle">0</int>
- <bool key="NSAnimates">NO</bool>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- <bool key="NSEditable">YES</bool>
- </object>
- <object class="NSTextField" id="436994758">
- <reference key="NSNextResponder" ref="1005"/>
- <int key="NSvFlags">266</int>
- <string key="NSFrame">{{49, 25}, {120, 17}}</string>
- <reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="217181972">
- <int key="NSCellFlags">67108928</int>
- <int key="NSCellFlags2">272631808</int>
- <string key="NSContents">Username</string>
- <object class="NSFont" key="NSSupport">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">13</double>
- <int key="NSfFlags">16</int>
- </object>
- <reference key="NSControlView" ref="436994758"/>
- <reference key="NSBackgroundColor" ref="814442900"/>
- <object class="NSColor" key="NSTextColor">
- <int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC4xMgA</bytes>
</object>
</object>
@@ -174,9 +91,10 @@
<string>NeXT TIFF v4.0 pasteboard type</string>
</object>
</object>
- <string key="NSFrame">{{6, 5}, {38, 38}}</string>
+ <string key="NSFrame">{{10, 5}, {19, 19}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="436994758"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="542906493">
<int key="NSCellFlags">134217728</int>
@@ -194,10 +112,11 @@
<bool key="NSEditable">YES</bool>
</object>
</object>
- <string key="NSFrameSize">{175, 48}</string>
+ <string key="NSFrameSize">{175, 29}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
- <string key="NSClassName">AvatarMenuItemView</string>
+ <reference key="NSNextKeyView" ref="772277894"/>
+ <string key="NSClassName">ActionBoxMenuItemView</string>
</object>
<object class="NSCustomObject" id="711726002">
<string key="NSClassName">ChromeUILocalizer</string>
@@ -216,14 +135,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">activeView</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="416344038"/>
- </object>
- <int key="connectionID">11</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">nameField</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="436994758"/>
@@ -240,30 +151,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">editButton</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="520854825"/>
- </object>
- <int key="connectionID">39</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">emailField</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="441443194"/>
- </object>
- <int key="connectionID">40</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">editProfile:</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="520854825"/>
- </object>
- <int key="connectionID">41</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">viewController</string>
<reference key="source" ref="1005"/>
<reference key="destination" ref="1001"/>
@@ -315,9 +202,6 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="772277894"/>
<reference ref="436994758"/>
- <reference ref="416344038"/>
- <reference ref="441443194"/>
- <reference ref="520854825"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -350,48 +234,6 @@
<reference key="parent" ref="436994758"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">8</int>
- <reference key="object" ref="416344038"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="857899611"/>
- </object>
- <reference key="parent" ref="1005"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">9</int>
- <reference key="object" ref="857899611"/>
- <reference key="parent" ref="416344038"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">23</int>
- <reference key="object" ref="441443194"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="309690559"/>
- </object>
- <reference key="parent" ref="1005"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">24</int>
- <reference key="object" ref="309690559"/>
- <reference key="parent" ref="441443194"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">25</int>
- <reference key="object" ref="520854825"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="909176510"/>
- </object>
- <reference key="parent" ref="1005"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">26</int>
- <reference key="object" ref="909176510"/>
- <reference key="parent" ref="520854825"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">42</int>
<reference key="object" ref="711726002"/>
<reference key="parent" ref="0"/>
@@ -407,20 +249,11 @@
<string>-3.IBPluginDependency</string>
<string>1.IBPluginDependency</string>
<string>2.IBPluginDependency</string>
- <string>23.IBPluginDependency</string>
- <string>24.CustomClassName</string>
- <string>24.IBPluginDependency</string>
- <string>25.IBPluginDependency</string>
- <string>26.CustomClassName</string>
- <string>26.IBPluginDependency</string>
<string>3.CustomClassName</string>
<string>3.IBPluginDependency</string>
<string>4.IBPluginDependency</string>
<string>42.IBPluginDependency</string>
<string>5.IBPluginDependency</string>
- <string>8.IBPluginDependency</string>
- <string>9.CustomClassName</string>
- <string>9.IBPluginDependency</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -429,20 +262,11 @@
<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>AccessibilityIgnoredTextFieldCell</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>HyperlinkButtonCell</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>AccessibilityIgnoredImageCell</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>AccessibilityIgnoredImageCell</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -471,64 +295,29 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">AccessibilityIgnoredTextFieldCell</string>
- <string key="superclassName">NSTextFieldCell</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AccessibilityIgnoredTextFieldCell.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">AvatarMenuItemController</string>
+ <string key="className">ActionBoxMenuItemController</string>
<string key="superclassName">NSViewController</string>
<object class="NSMutableDictionary" key="actions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>editProfile:</string>
- <string>switchToProfile:</string>
- </object>
- <object class="NSArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
- <string>id</string>
- </object>
+ <string key="NS.key.0">itemSelected:</string>
+ <string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>editProfile:</string>
- <string>switchToProfile:</string>
- </object>
- <object class="NSArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBActionInfo">
- <string key="name">editProfile:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">switchToProfile:</string>
- <string key="candidateClassName">id</string>
- </object>
+ <string key="NS.key.0">itemSelected:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">itemSelected:</string>
+ <string key="candidateClassName">id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>activeView</string>
- <string>editButton</string>
- <string>emailField</string>
<string>iconView</string>
<string>nameField</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSImageView</string>
- <string>NSButton</string>
- <string>NSTextField</string>
- <string>NSImageView</string>
<string>NSTextField</string>
</object>
</object>
@@ -536,27 +325,12 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>activeView</string>
- <string>editButton</string>
- <string>emailField</string>
<string>iconView</string>
<string>nameField</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
- <string key="name">activeView</string>
- <string key="candidateClassName">NSImageView</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">editButton</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">emailField</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
<string key="name">iconView</string>
<string key="candidateClassName">NSImageView</string>
</object>
@@ -568,26 +342,26 @@
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AvatarMenuItemController.h</string>
+ <string key="minorKey">./Classes/ActionBoxMenuItemController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">AvatarMenuItemView</string>
+ <string key="className">ActionBoxMenuItemView</string>
<string key="superclassName">NSView</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">viewController</string>
- <string key="NS.object.0">AvatarMenuItemController</string>
+ <string key="NS.object.0">ActionBoxMenuItemController</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">viewController</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">viewController</string>
- <string key="candidateClassName">AvatarMenuItemController</string>
+ <string key="candidateClassName">ActionBoxMenuItemController</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AvatarMenuItemView.h</string>
+ <string key="minorKey">./Classes/ActionBoxMenuItemView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -645,21 +419,13 @@
<string key="minorKey">./Classes/GTMUILocalizer.h</string>
</object>
</object>
- <object class="IBPartialClassDescription">
- <string key="className">HyperlinkButtonCell</string>
- <string key="superclassName">NSButtonCell</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/HyperlinkButtonCell.h</string>
- </object>
- </object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
- <real value="1070" key="NS.object.0"/>
+ <real value="1060" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
@@ -668,17 +434,8 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSLockLockedTemplate</string>
- <string>NSUser</string>
- </object>
- <object class="NSArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>{9, 12}</string>
- <string>{32, 32}</string>
- </object>
+ <string key="NS.key.0">NSUser</string>
+ <string key="NS.object.0">{32, 32}</string>
</object>
</data>
</archive>
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/base_bubble_controller.mm » ('j') | chrome/browser/ui/cocoa/info_bubble_view.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698