diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-06 00:28:35 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-06 00:28:35 +0000 |
| commit | 20ede07176ece47e95efa8f355ee68a61166b68c (patch) | |
| tree | 87b994d26fba0129ab5c28998f7ba9e99c04c735 /chrome/app | |
| parent | 48285173b623d950ecb04be6fd120f464c447e61 (diff) | |
| download | chromium_src-20ede07176ece47e95efa8f355ee68a61166b68c.zip chromium_src-20ede07176ece47e95efa8f355ee68a61166b68c.tar.gz chromium_src-20ede07176ece47e95efa8f355ee68a61166b68c.tar.bz2 | |
Mac: Implements the special bookmark bar on NTP.
Based mostly on Ben's patch, but made it compile, work, and descoped
moving the bookmark bar around the view heiarchy.
XIB modification: The root view is now a BookmarkBarToolbarView instead of an NSView and is [BookmarkBarController view].
BUG=17625
Review URL: http://codereview.chromium.org/246034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/nibs/BookmarkBar.xib | 93 |
1 files changed, 61 insertions, 32 deletions
diff --git a/chrome/app/nibs/BookmarkBar.xib b/chrome/app/nibs/BookmarkBar.xib index 32db393..0b9c9078 100644 --- a/chrome/app/nibs/BookmarkBar.xib +++ b/chrome/app/nibs/BookmarkBar.xib @@ -8,10 +8,9 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="75"/> + <integer value="18"/> <integer value="1"/> <integer value="4"/> - <integer value="18"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -37,26 +36,6 @@ <object class="NSCustomObject" id="1004"> <string key="NSClassName">NSApplication</string> </object> - <object class="NSMenu" id="190917733"> - <string key="NSTitle"/> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="582055256"> - <reference key="NSMenu" ref="190917733"/> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <object class="NSCustomResource" key="NSOnImage" id="932677134"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSMenuCheckmark</string> - </object> - <object class="NSCustomResource" key="NSMixedImage" id="126584967"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSMenuMixedState</string> - </object> - </object> - </object> - </object> <object class="NSCustomView" id="620641226"> <reference key="NSNextResponder"/> <int key="NSvFlags">-2147483358</int> @@ -134,7 +113,27 @@ </object> <string key="NSFrameSize">{600, 144}</string> <reference key="NSSuperview"/> - <string key="NSClassName">NSView</string> + <string key="NSClassName">BookmarkBarToolbarView</string> + </object> + <object class="NSMenu" id="190917733"> + <string key="NSTitle"/> + <object class="NSMutableArray" key="NSMenuItems"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMenuItem" id="582055256"> + <reference key="NSMenu" ref="190917733"/> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <object class="NSCustomResource" key="NSOnImage" id="932677134"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSMenuCheckmark</string> + </object> + <object class="NSCustomResource" key="NSMixedImage" id="126584967"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSMenuMixedState</string> + </object> + </object> + </object> </object> <object class="NSMenu" id="183701277"> <string key="NSTitle"/> @@ -373,14 +372,6 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">view</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="620641226"/> - </object> - <int key="connectionID">3</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">buttonContextMenu_</string> <reference key="source" ref="1001"/> <reference key="destination" ref="672481054"/> @@ -619,6 +610,22 @@ </object> <int key="connectionID">91</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">controller_</string> + <reference key="source" ref="620641226"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">92</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">view</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="620641226"/> + </object> + <int key="connectionID">93</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -1005,12 +1012,20 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">91</int> + <int key="maxID">93</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> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/background_gradient_view.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">BookmarkBarController</string> <string key="superclassName">NSViewController</string> <object class="NSMutableDictionary" key="actions"> @@ -1050,6 +1065,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>buttonContextMenu_</string> <string>buttonView_</string> + <string>compressDelegate_</string> <string>offTheSideButton_</string> <string>resizeDelegate_</string> <string>urlDelegate_</string> @@ -1058,6 +1074,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>NSMenu</string> <string>BookmarkBarView</string> + <string>id</string> <string>MenuButton</string> <string>id</string> <string>id</string> @@ -1069,6 +1086,18 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">BookmarkBarToolbarView</string> + <string key="superclassName">BackgroundGradientView</string> + <object class="NSMutableDictionary" key="outlets"> + <string key="NS.key.0">controller_</string> + <string key="NS.object.0">id</string> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/bookmark_bar_toolbar_view.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">BookmarkBarView</string> <string key="superclassName">NSView</string> <object class="NSMutableDictionary" key="outlets"> |