Index: chrome/app/nibs/BookmarkBar.xib |
diff --git a/chrome/app/nibs/BookmarkBar.xib b/chrome/app/nibs/BookmarkBar.xib |
index 610c3404153a417b1844789a08b454583feaa2f0..9ffed2a7b6410a84e7d757b3bcada956eec0b617 100644 |
--- a/chrome/app/nibs/BookmarkBar.xib |
+++ b/chrome/app/nibs/BookmarkBar.xib |
@@ -2,19 +2,19 @@ |
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> |
<data> |
<int key="IBDocument.SystemTarget">1050</int> |
- <string key="IBDocument.SystemVersion">10D578</string> |
- <string key="IBDocument.InterfaceBuilderVersion">762</string> |
+ <string key="IBDocument.SystemVersion">10F2108</string> |
+ <string key="IBDocument.InterfaceBuilderVersion">823</string> |
<string key="IBDocument.AppKitVersion">1038.29</string> |
- <string key="IBDocument.HIToolboxVersion">460.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">762</string> |
+ <string key="NS.object.0">823</string> |
</object> |
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> |
<bool key="EncodedWithXMLCoder">YES</bool> |
+ <integer value="4"/> |
<integer value="1"/> |
<integer value="18"/> |
- <integer value="4"/> |
</object> |
<object class="NSArray" key="IBDocument.PluginDependencies"> |
<bool key="EncodedWithXMLCoder">YES</bool> |
@@ -1265,7 +1265,7 @@ |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
- <string>{{3, 1010}, {600, 142}}</string> |
+ <string>{{4, 864}, {600, 142}}</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
@@ -1289,7 +1289,7 @@ |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<string>BookmarkMenu</string> |
- <string>{{16, 153}, {362, 293}}</string> |
+ <string>{{333, 153}, {362, 293}}</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
@@ -1304,7 +1304,7 @@ |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<string>BookmarkMenu</string> |
- <string>{{15, 508}, {372, 293}}</string> |
+ <string>{{333, 508}, {372, 293}}</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> |
@@ -1358,6 +1358,25 @@ |
<string>id</string> |
</object> |
</object> |
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <object class="NSArray" key="dict.sortedKeys"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <string>delegate_</string> |
+ <string>resizeDelegate_</string> |
+ </object> |
+ <object class="NSMutableArray" key="dict.values"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <object class="IBToOneOutletInfo"> |
+ <string key="name">delegate_</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBToOneOutletInfo"> |
+ <string key="name">resizeDelegate_</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ </object> |
+ </object> |
<object class="IBClassDescriptionSource" key="sourceIdentifier"> |
<string key="majorKey">IBProjectSource</string> |
<string key="minorKey">browser/ui/cocoa/animatable_view.h</string> |
@@ -1417,6 +1436,100 @@ |
<string>id</string> |
</object> |
</object> |
+ <object class="NSMutableDictionary" key="actionInfosByName"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <object class="NSArray" key="dict.sortedKeys"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <string>addFolder:</string> |
+ <string>addPage:</string> |
+ <string>copyBookmark:</string> |
+ <string>cutBookmark:</string> |
+ <string>deleteBookmark:</string> |
+ <string>editBookmark:</string> |
+ <string>importBookmarks:</string> |
+ <string>openAllBookmarks:</string> |
+ <string>openAllBookmarksIncognitoWindow:</string> |
+ <string>openAllBookmarksNewWindow:</string> |
+ <string>openBookmark:</string> |
+ <string>openBookmarkFolderFromButton:</string> |
+ <string>openBookmarkInIncognitoWindow:</string> |
+ <string>openBookmarkInNewForegroundTab:</string> |
+ <string>openBookmarkInNewWindow:</string> |
+ <string>openOffTheSideFolderFromButton:</string> |
+ <string>pasteBookmark:</string> |
+ </object> |
+ <object class="NSMutableArray" key="dict.values"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <object class="IBActionInfo"> |
+ <string key="name">addFolder:</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBActionInfo"> |
+ <string key="name">addPage:</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBActionInfo"> |
+ <string key="name">copyBookmark:</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBActionInfo"> |
+ <string key="name">cutBookmark:</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBActionInfo"> |
+ <string key="name">deleteBookmark:</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBActionInfo"> |
+ <string key="name">editBookmark:</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBActionInfo"> |
+ <string key="name">importBookmarks:</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBActionInfo"> |
+ <string key="name">openAllBookmarks:</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBActionInfo"> |
+ <string key="name">openAllBookmarksIncognitoWindow:</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBActionInfo"> |
+ <string key="name">openAllBookmarksNewWindow:</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBActionInfo"> |
+ <string key="name">openBookmark:</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBActionInfo"> |
+ <string key="name">openBookmarkFolderFromButton:</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBActionInfo"> |
+ <string key="name">openBookmarkInIncognitoWindow:</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBActionInfo"> |
+ <string key="name">openBookmarkInNewForegroundTab:</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBActionInfo"> |
+ <string key="name">openBookmarkInNewWindow:</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBActionInfo"> |
+ <string key="name">openOffTheSideFolderFromButton:</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBActionInfo"> |
+ <string key="name">pasteBookmark:</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ </object> |
+ </object> |
<object class="NSMutableDictionary" key="outlets"> |
<bool key="EncodedWithXMLCoder">YES</bool> |
<object class="NSArray" key="dict.sortedKeys"> |
@@ -1436,6 +1549,40 @@ |
<string>id</string> |
</object> |
</object> |
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <object class="NSArray" key="dict.sortedKeys"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <string>buttonContextMenu_</string> |
+ <string>buttonView_</string> |
+ <string>delegate_</string> |
+ <string>offTheSideButton_</string> |
+ <string>resizeDelegate_</string> |
+ </object> |
+ <object class="NSMutableArray" key="dict.values"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <object class="IBToOneOutletInfo"> |
+ <string key="name">buttonContextMenu_</string> |
+ <string key="candidateClassName">NSMenu</string> |
+ </object> |
+ <object class="IBToOneOutletInfo"> |
+ <string key="name">buttonView_</string> |
+ <string key="candidateClassName">BookmarkBarView</string> |
+ </object> |
+ <object class="IBToOneOutletInfo"> |
+ <string key="name">delegate_</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBToOneOutletInfo"> |
+ <string key="name">offTheSideButton_</string> |
+ <string key="candidateClassName">BookmarkButton</string> |
+ </object> |
+ <object class="IBToOneOutletInfo"> |
+ <string key="name">resizeDelegate_</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ </object> |
+ </object> |
<object class="IBClassDescriptionSource" key="sourceIdentifier"> |
<string key="majorKey">IBProjectSource</string> |
<string key="minorKey">browser/ui/cocoa/bookmarks/bookmark_bar_controller.h</string> |
@@ -1455,6 +1602,13 @@ |
<string key="NS.key.0">controller_</string> |
<string key="NS.object.0">id</string> |
</object> |
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName"> |
+ <string key="NS.key.0">controller_</string> |
+ <object class="IBToOneOutletInfo" key="NS.object.0"> |
+ <string key="name">controller_</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ </object> |
<object class="IBClassDescriptionSource" key="sourceIdentifier"> |
<string key="majorKey">IBProjectSource</string> |
<string key="minorKey">browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h</string> |
@@ -1462,7 +1616,7 @@ |
</object> |
<object class="IBPartialClassDescription"> |
<string key="className">BookmarkBarView</string> |
- <string key="superclassName">NSView</string> |
+ <string key="superclassName">BackgroundGradientView</string> |
<object class="NSMutableDictionary" key="outlets"> |
<bool key="EncodedWithXMLCoder">YES</bool> |
<object class="NSArray" key="dict.sortedKeys"> |
@@ -1480,6 +1634,35 @@ |
<string>NSTextField</string> |
</object> |
</object> |
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <object class="NSArray" key="dict.sortedKeys"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <string>controller_</string> |
+ <string>importBookmarksButton_</string> |
+ <string>noItemContainer</string> |
+ <string>noItemTextfield_</string> |
+ </object> |
+ <object class="NSMutableArray" key="dict.values"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <object class="IBToOneOutletInfo"> |
+ <string key="name">controller_</string> |
+ <string key="candidateClassName">BookmarkBarController</string> |
+ </object> |
+ <object class="IBToOneOutletInfo"> |
+ <string key="name">importBookmarksButton_</string> |
+ <string key="candidateClassName">NSButton</string> |
+ </object> |
+ <object class="IBToOneOutletInfo"> |
+ <string key="name">noItemContainer</string> |
+ <string key="candidateClassName">NSView</string> |
+ </object> |
+ <object class="IBToOneOutletInfo"> |
+ <string key="name">noItemTextfield_</string> |
+ <string key="candidateClassName">NSTextField</string> |
+ </object> |
+ </object> |
+ </object> |
<object class="IBClassDescriptionSource" key="sourceIdentifier"> |
<string key="majorKey">IBProjectSource</string> |
<string key="minorKey">browser/ui/cocoa/bookmarks/bookmark_bar_view.h</string> |
@@ -1487,7 +1670,7 @@ |
</object> |
<object class="IBPartialClassDescription"> |
<string key="className">BookmarkBarView</string> |
- <string key="superclassName">NSView</string> |
+ <string key="superclassName">BackgroundGradientView</string> |
<object class="IBClassDescriptionSource" key="sourceIdentifier"> |
<string key="majorKey">IBUserSource</string> |
<string key="minorKey"/> |
@@ -1504,6 +1687,13 @@ |
<string key="NS.key.0">delegate_</string> |
<string key="NS.object.0">NSObject</string> |
</object> |
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName"> |
+ <string key="NS.key.0">delegate_</string> |
+ <object class="IBToOneOutletInfo" key="NS.object.0"> |
+ <string key="name">delegate_</string> |
+ <string key="candidateClassName">NSObject</string> |
+ </object> |
+ </object> |
<object class="IBClassDescriptionSource" key="sourceIdentifier"> |
<string key="majorKey">IBProjectSource</string> |
<string key="minorKey">browser/ui/cocoa/bookmarks/bookmark_button.h</string> |
@@ -1548,6 +1738,13 @@ |
<string key="NS.key.0">commandDispatch:</string> |
<string key="NS.object.0">id</string> |
</object> |
+ <object class="NSMutableDictionary" key="actionInfosByName"> |
+ <string key="NS.key.0">commandDispatch:</string> |
+ <object class="IBActionInfo" key="NS.object.0"> |
+ <string key="name">commandDispatch:</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ </object> |
<object class="IBClassDescriptionSource" key="sourceIdentifier"> |
<string key="majorKey">IBUserSource</string> |
<string key="minorKey"/> |
@@ -1571,6 +1768,30 @@ |
<string>id</string> |
</object> |
</object> |
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <object class="NSArray" key="dict.sortedKeys"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <string>otherObjectToLocalize_</string> |
+ <string>owner_</string> |
+ <string>yetAnotherObjectToLocalize_</string> |
+ </object> |
+ <object class="NSMutableArray" key="dict.values"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <object class="IBToOneOutletInfo"> |
+ <string key="name">otherObjectToLocalize_</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBToOneOutletInfo"> |
+ <string key="name">owner_</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBToOneOutletInfo"> |
+ <string key="name">yetAnotherObjectToLocalize_</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ </object> |
+ </object> |
<object class="IBClassDescriptionSource" key="sourceIdentifier"> |
<string key="majorKey">IBProjectSource</string> |
<string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizer.h</string> |
@@ -1594,6 +1815,30 @@ |
<string>id</string> |
</object> |
</object> |
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <object class="NSArray" key="dict.sortedKeys"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <string>localizerOwner_</string> |
+ <string>localizer_</string> |
+ <string>uiObject_</string> |
+ </object> |
+ <object class="NSMutableArray" key="dict.values"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <object class="IBToOneOutletInfo"> |
+ <string key="name">localizerOwner_</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBToOneOutletInfo"> |
+ <string key="name">localizer_</string> |
+ <string key="candidateClassName">GTMUILocalizer</string> |
+ </object> |
+ <object class="IBToOneOutletInfo"> |
+ <string key="name">uiObject_</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ </object> |
+ </object> |
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="30598627"> |
<string key="majorKey">IBProjectSource</string> |
<string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h</string> |
@@ -1617,6 +1862,30 @@ |
<string>NSView</string> |
</object> |
</object> |
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <object class="NSArray" key="dict.sortedKeys"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <string>viewToResize_</string> |
+ <string>viewToSlideAndResize_</string> |
+ <string>viewToSlide_</string> |
+ </object> |
+ <object class="NSMutableArray" key="dict.values"> |
+ <bool key="EncodedWithXMLCoder">YES</bool> |
+ <object class="IBToOneOutletInfo"> |
+ <string key="name">viewToResize_</string> |
+ <string key="candidateClassName">id</string> |
+ </object> |
+ <object class="IBToOneOutletInfo"> |
+ <string key="name">viewToSlideAndResize_</string> |
+ <string key="candidateClassName">NSView</string> |
+ </object> |
+ <object class="IBToOneOutletInfo"> |
+ <string key="name">viewToSlide_</string> |
+ <string key="candidateClassName">NSView</string> |
+ </object> |
+ </object> |
+ </object> |
<reference key="sourceIdentifier" ref="30598627"/> |
</object> |
<object class="IBPartialClassDescription"> |
@@ -1667,7 +1936,14 @@ |
<string key="className">NSObject</string> |
<object class="IBClassDescriptionSource" key="sourceIdentifier"> |
<string key="majorKey">IBProjectSource</string> |
- <string key="minorKey">browser/ui/cocoa/tab_strip_model_observer_bridge.h</string> |
+ <string key="minorKey">browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.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> |
</object> |
@@ -2330,6 +2606,13 @@ |
<string key="NS.key.0">view</string> |
<string key="NS.object.0">NSView</string> |
</object> |
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName"> |
+ <string key="NS.key.0">view</string> |
+ <object class="IBToOneOutletInfo" key="NS.object.0"> |
+ <string key="name">view</string> |
+ <string key="candidateClassName">NSView</string> |
+ </object> |
+ </object> |
<object class="IBClassDescriptionSource" key="sourceIdentifier"> |
<string key="majorKey">IBFrameworkSource</string> |
<string key="minorKey">AppKit.framework/Headers/NSViewController.h</string> |