Index: chrome/app/nibs/MainMenu.xib |
diff --git a/chrome/app/nibs/MainMenu.xib b/chrome/app/nibs/MainMenu.xib |
index ae55a8ff9ea7ba7cbe14ef506f2be69e6028547f..ac5ebd4617e6a948ae9b60f3bcdd85c03a8d0049 100644 |
--- a/chrome/app/nibs/MainMenu.xib |
+++ b/chrome/app/nibs/MainMenu.xib |
@@ -2,17 +2,17 @@ |
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> |
<data> |
<int key="IBDocument.SystemTarget">1050</int> |
- <string key="IBDocument.SystemVersion">10J567</string> |
- <string key="IBDocument.InterfaceBuilderVersion">788</string> |
+ <string key="IBDocument.SystemVersion">10J869</string> |
+ <string key="IBDocument.InterfaceBuilderVersion">823</string> |
<string key="IBDocument.AppKitVersion">1038.35</string> |
- <string key="IBDocument.HIToolboxVersion">462.00</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">788</string> |
+ <string key="NS.object.0">823</string> |
</object> |
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> |
<bool key="EncodedWithXMLCoder">YES</bool> |
- <integer value="205"/> |
+ <integer value="81"/> |
</object> |
<object class="NSArray" key="IBDocument.PluginDependencies"> |
<bool key="EncodedWithXMLCoder">YES</bool> |
@@ -331,8 +331,8 @@ |
<object class="NSMenuItem" id="776162233"> |
<reference key="NSMenu" ref="720053764"/> |
<string key="NSTitle">^IDS_CLOSE_WINDOW_MAC</string> |
- <string key="NSKeyEquiv">w</string> |
- <int key="NSKeyEquivModMask">1048576</int> |
+ <string key="NSKeyEquiv">W</string> |
+ <int key="NSKeyEquivModMask">1179648</int> |
<int key="NSMnemonicLoc">2147483647</int> |
<reference key="NSOnImage" ref="353210768"/> |
<reference key="NSMixedImage" ref="549394948"/> |
@@ -340,7 +340,8 @@ |
<object class="NSMenuItem" id="1059729334"> |
<reference key="NSMenu" ref="720053764"/> |
<string key="NSTitle">^IDS_CLOSE_TAB_MAC</string> |
- <string key="NSKeyEquiv"/> |
+ <string key="NSKeyEquiv">w</string> |
+ <int key="NSKeyEquivModMask">1048576</int> |
<int key="NSMnemonicLoc">2147483647</int> |
<reference key="NSOnImage" ref="353210768"/> |
<reference key="NSMixedImage" ref="549394948"/> |
@@ -1204,6 +1205,9 @@ |
<object class="NSCustomObject" id="979722531"> |
<string key="NSClassName">ChromeUILocalizer</string> |
</object> |
+ <object class="NSUserDefaultsController" id="73335703"> |
+ <bool key="NSSharedInstance">YES</bool> |
+ </object> |
</object> |
<object class="IBObjectContainer" key="IBDocument.Objects"> |
<object class="NSMutableArray" key="connectionRecords"> |
@@ -2690,6 +2694,11 @@ |
<reference key="object" ref="499460629"/> |
<reference key="parent" ref="789758025"/> |
</object> |
+ <object class="IBObjectRecord"> |
+ <int key="objectID">691</int> |
+ <reference key="object" ref="73335703"/> |
+ <reference key="parent" ref="0"/> |
+ </object> |
</object> |
</object> |
<object class="NSMutableDictionary" key="flattenedProperties"> |
@@ -2922,7 +2931,7 @@ |
<integer value="1"/> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<integer value="1"/> |
- <string>{{434, 233}, {64, 6}}</string> |
+ <string>{{417, 332}, {64, 6}}</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<integer value="1"/> |
<string>{{436, 809}, {64, 6}}</string> |
@@ -2962,7 +2971,7 @@ |
<integer value="1"/> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<integer value="1"/> |
- <string>{{592, 471}, {358, 263}}</string> |
+ <string>{{619, 471}, {358, 263}}</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<integer value="1"/> |
<string>{{197, 734}, {243, 243}}</string> |
@@ -3006,7 +3015,7 @@ |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<integer value="1"/> |
<string>{{525, 802}, {197, 73}}</string> |
- <string>{{177, 734}, {1578, 20}}</string> |
+ <string>{{17, 468}, {1566, 20}}</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<integer value="1"/> |
<string>{74, 862}</string> |
@@ -3069,7 +3078,7 @@ |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<integer value="1"/> |
- <string>{{189, 451}, {388, 283}}</string> |
+ <string>{{29, 185}, {388, 283}}</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<integer value="1"/> |
<string>{{23, 794}, {245, 183}}</string> |
@@ -3113,7 +3122,7 @@ |
<integer value="1"/> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<integer value="1"/> |
- <string>{{349, 54}, {350, 283}}</string> |
+ <string>{{291, 185}, {350, 283}}</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<integer value="1"/> |
<string>{{323, 672}, {199, 203}}</string> |
@@ -3141,7 +3150,7 @@ |
</object> |
</object> |
<nil key="sourceID"/> |
- <int key="maxID">690</int> |
+ <int key="maxID">692</int> |
</object> |
<object class="IBClassDescriber" key="IBDocument.Classes"> |
<object class="NSMutableArray" key="referencedPartialClassDescriptions"> |
@@ -3320,18 +3329,14 @@ |
<object class="NSArray" key="dict.sortedKeys"> |
<bool key="EncodedWithXMLCoder">YES</bool> |
<string>hoverCloseButton_</string> |
- <string>image_</string> |
<string>itemContainerView_</string> |
<string>resizeDelegate_</string> |
- <string>showAllDownloadsCell_</string> |
</object> |
<object class="NSMutableArray" key="dict.values"> |
<bool key="EncodedWithXMLCoder">YES</bool> |
<string>HoverButton</string> |
- <string>NSImageView</string> |
<string>NSView</string> |
<string>id</string> |
- <string>HyperlinkButtonCell</string> |
</object> |
</object> |
<object class="NSMutableDictionary" key="toOneOutletInfosByName"> |
@@ -3339,10 +3344,8 @@ |
<object class="NSArray" key="dict.sortedKeys"> |
<bool key="EncodedWithXMLCoder">YES</bool> |
<string>hoverCloseButton_</string> |
- <string>image_</string> |
<string>itemContainerView_</string> |
<string>resizeDelegate_</string> |
- <string>showAllDownloadsCell_</string> |
</object> |
<object class="NSMutableArray" key="dict.values"> |
<bool key="EncodedWithXMLCoder">YES</bool> |
@@ -3351,10 +3354,6 @@ |
<string key="candidateClassName">HoverButton</string> |
</object> |
<object class="IBToOneOutletInfo"> |
- <string key="name">image_</string> |
- <string key="candidateClassName">NSImageView</string> |
- </object> |
- <object class="IBToOneOutletInfo"> |
<string key="name">itemContainerView_</string> |
<string key="candidateClassName">NSView</string> |
</object> |
@@ -3362,10 +3361,6 @@ |
<string key="name">resizeDelegate_</string> |
<string key="candidateClassName">id</string> |
</object> |
- <object class="IBToOneOutletInfo"> |
- <string key="name">showAllDownloadsCell_</string> |
- <string key="candidateClassName">HyperlinkButtonCell</string> |
- </object> |
</object> |
</object> |
<object class="IBClassDescriptionSource" key="sourceIdentifier"> |
@@ -3469,25 +3464,24 @@ |
</object> |
</object> |
<object class="IBPartialClassDescription"> |
- <string key="className">HyperlinkButtonCell</string> |
- <string key="superclassName">NSButtonCell</string> |
+ <string key="className">NSMenuItem</string> |
<object class="IBClassDescriptionSource" key="sourceIdentifier"> |
<string key="majorKey">IBProjectSource</string> |
- <string key="minorKey">browser/ui/cocoa/hyperlink_button_cell.h</string> |
+ <string key="minorKey">browser/ui/cocoa/nsmenuitem_additions.h</string> |
</object> |
</object> |
<object class="IBPartialClassDescription"> |
- <string key="className">NSMenuItem</string> |
+ <string key="className">NSObject</string> |
<object class="IBClassDescriptionSource" key="sourceIdentifier"> |
<string key="majorKey">IBProjectSource</string> |
- <string key="minorKey">browser/ui/cocoa/nsmenuitem_additions.h</string> |
+ <string key="minorKey">../third_party/GTM/Foundation/GTMNSObject+KeyValueObserving.h</string> |
</object> |
</object> |
<object class="IBPartialClassDescription"> |
<string key="className">NSObject</string> |
<object class="IBClassDescriptionSource" key="sourceIdentifier"> |
<string key="majorKey">IBProjectSource</string> |
- <string key="minorKey">../third_party/GTM/Foundation/GTMNSObject+KeyValueObserving.h</string> |
+ <string key="minorKey">browser/renderer_host/accelerated_plugin_view_mac.h</string> |
</object> |
</object> |
<object class="IBPartialClassDescription"> |
@@ -3515,6 +3509,13 @@ |
<string key="className">NSView</string> |
<object class="IBClassDescriptionSource" key="sourceIdentifier"> |
<string key="majorKey">IBProjectSource</string> |
+ <string key="minorKey">browser/ui/cocoa/nsview_additions.h</string> |
+ </object> |
+ </object> |
+ <object class="IBPartialClassDescription"> |
+ <string key="className">NSView</string> |
+ <object class="IBClassDescriptionSource" key="sourceIdentifier"> |
+ <string key="majorKey">IBProjectSource</string> |
<string key="minorKey">browser/ui/cocoa/view_id_util.h</string> |
</object> |
</object> |
@@ -3547,14 +3548,6 @@ |
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> |
<bool key="EncodedWithXMLCoder">YES</bool> |
<object class="IBPartialClassDescription"> |
- <string key="className">NSActionCell</string> |
- <string key="superclassName">NSCell</string> |
- <object class="IBClassDescriptionSource" key="sourceIdentifier"> |
- <string key="majorKey">IBFrameworkSource</string> |
- <string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string> |
- </object> |
- </object> |
- <object class="IBPartialClassDescription"> |
<string key="className">NSApplication</string> |
<string key="superclassName">NSResponder</string> |
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="340618385"> |
@@ -3607,27 +3600,19 @@ |
</object> |
</object> |
<object class="IBPartialClassDescription"> |
- <string key="className">NSButtonCell</string> |
- <string key="superclassName">NSActionCell</string> |
- <object class="IBClassDescriptionSource" key="sourceIdentifier"> |
+ <string key="className">NSControl</string> |
+ <string key="superclassName">NSView</string> |
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1030194510"> |
<string key="majorKey">IBFrameworkSource</string> |
- <string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string> |
+ <string key="minorKey">AppKit.framework/Headers/NSControl.h</string> |
</object> |
</object> |
<object class="IBPartialClassDescription"> |
- <string key="className">NSCell</string> |
+ <string key="className">NSController</string> |
<string key="superclassName">NSObject</string> |
<object class="IBClassDescriptionSource" key="sourceIdentifier"> |
<string key="majorKey">IBFrameworkSource</string> |
- <string key="minorKey">AppKit.framework/Headers/NSCell.h</string> |
- </object> |
- </object> |
- <object class="IBPartialClassDescription"> |
- <string key="className">NSControl</string> |
- <string key="superclassName">NSView</string> |
- <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1030194510"> |
- <string key="majorKey">IBFrameworkSource</string> |
- <string key="minorKey">AppKit.framework/Headers/NSControl.h</string> |
+ <string key="minorKey">AppKit.framework/Headers/NSController.h</string> |
</object> |
</object> |
<object class="IBPartialClassDescription"> |
@@ -3647,14 +3632,6 @@ |
</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">NSMatrix</string> |
<string key="superclassName">NSControl</string> |
<object class="IBClassDescriptionSource" key="sourceIdentifier"> |
@@ -4202,6 +4179,14 @@ |
<reference key="sourceIdentifier" ref="866990797"/> |
</object> |
<object class="IBPartialClassDescription"> |
+ <string key="className">NSUserDefaultsController</string> |
+ <string key="superclassName">NSController</string> |
+ <object class="IBClassDescriptionSource" key="sourceIdentifier"> |
+ <string key="majorKey">IBFrameworkSource</string> |
+ <string key="minorKey">AppKit.framework/Headers/NSUserDefaultsController.h</string> |
+ </object> |
+ </object> |
+ <object class="IBPartialClassDescription"> |
<string key="className">NSView</string> |
<object class="IBClassDescriptionSource" key="sourceIdentifier"> |
<string key="majorKey">IBFrameworkSource</string> |