diff options
| -rw-r--r-- | chrome/app/nibs/SideToolbar.xib | 1051 | ||||
| -rw-r--r-- | chrome/browser/cocoa/browser_window_controller.mm | 12 | ||||
| -rw-r--r-- | chrome/browser/cocoa/browser_window_controller_private.h | 8 | ||||
| -rw-r--r-- | chrome/browser/cocoa/browser_window_controller_private.mm | 47 | ||||
| -rw-r--r-- | chrome/browser/cocoa/side_tabs_toolbar_controller.h | 30 | ||||
| -rw-r--r-- | chrome/browser/cocoa/side_tabs_toolbar_controller.mm | 57 | ||||
| -rwxr-xr-x | chrome/chrome_browser.gypi | 3 | ||||
| -rw-r--r-- | chrome/chrome_dll.gypi | 1 |
8 files changed, 22 insertions, 1187 deletions
diff --git a/chrome/app/nibs/SideToolbar.xib b/chrome/app/nibs/SideToolbar.xib deleted file mode 100644 index 7570447..0000000 --- a/chrome/app/nibs/SideToolbar.xib +++ /dev/null @@ -1,1051 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> - <data> - <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9L31a</string> - <string key="IBDocument.InterfaceBuilderVersion">677</string> - <string key="IBDocument.AppKitVersion">949.54</string> - <string key="IBDocument.HIToolboxVersion">353.00</string> - <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> - <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="1"/> - </object> - <object class="NSArray" key="IBDocument.PluginDependencies"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - </object> - <object class="NSMutableDictionary" key="IBDocument.Metadata"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - </object> - <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSCustomObject" id="1001"> - <string key="NSClassName">SideTabsToolbarController</string> - </object> - <object class="NSCustomObject" id="1003"> - <string key="NSClassName">FirstResponder</string> - </object> - <object class="NSCustomObject" id="1004"> - <string key="NSClassName">NSApplication</string> - </object> - <object class="NSCustomView" id="928520650"> - <reference key="NSNextResponder"/> - <int key="NSvFlags">266</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSCustomView" id="421615633"> - <reference key="NSNextResponder" ref="928520650"/> - <int key="NSvFlags">-2147483383</int> - <string key="NSFrame">{{540, -8}, {0, 36}}</string> - <reference key="NSSuperview" ref="928520650"/> - <string key="NSClassName">BrowserActionsContainerView</string> - </object> - <object class="NSTextField" id="535508469"> - <reference key="NSNextResponder" ref="928520650"/> - <int key="NSvFlags">268</int> - <string key="NSFrameSize">{171, 27}</string> - <reference key="NSSuperview" ref="928520650"/> - <int key="NSTag">33004</int> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="464583340"> - <int key="NSCellFlags">-1804468671</int> - <int key="NSCellFlags2">66560</int> - <string key="NSContents">chromium.org</string> - <object class="NSFont" key="NSSupport"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.300000e+01</double> - <int key="NSfFlags">16</int> - </object> - <reference key="NSControlView" ref="535508469"/> - <bool key="NSDrawsBackground">YES</bool> - <object class="NSColor" key="NSBackgroundColor"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">textBackgroundColor</string> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MQA</bytes> - </object> - </object> - <object class="NSColor" key="NSTextColor"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">textColor</string> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MAA</bytes> - </object> - </object> - </object> - </object> - <object class="NSButton" id="368496192"> - <reference key="NSNextResponder" ref="928520650"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{298, 0}, {29, 27}}</string> - <reference key="NSSuperview" ref="928520650"/> - <int key="NSTag">33003</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="760046712"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134250496</int> - <string key="NSContents"/> - <object class="NSFont" key="NSSupport" id="64724822"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.300000e+01</double> - <int key="NSfFlags">1044</int> - </object> - <reference key="NSControlView" ref="368496192"/> - <int key="NSButtonFlags">-2030288641</int> - <int key="NSButtonFlags2">6</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">home_Template</string> - </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - </object> - </object> - <object class="NSButton" id="458854861"> - <reference key="NSNextResponder" ref="928520650"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{259, 0}, {29, 27}}</string> - <reference key="NSSuperview" ref="928520650"/> - <int key="NSTag">33002</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="386107000"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134250496</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="64724822"/> - <reference key="NSControlView" ref="458854861"/> - <int key="NSButtonFlags">-2033434369</int> - <int key="NSButtonFlags2">6</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">reload_Template</string> - </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - </object> - </object> - <object class="NSButton" id="781044416"> - <reference key="NSNextResponder" ref="928520650"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{232, 0}, {29, 27}}</string> - <reference key="NSSuperview" ref="928520650"/> - <int key="NSTag">33001</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="3781855"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134250496</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="64724822"/> - <int key="NSTag">1</int> - <reference key="NSControlView" ref="781044416"/> - <int key="NSButtonFlags">-2031337217</int> - <int key="NSButtonFlags2">6</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">forward_Template</string> - </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - </object> - </object> - <object class="NSButton" id="634265909"> - <reference key="NSNextResponder" ref="928520650"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{204, 0}, {29, 27}}</string> - <reference key="NSSuperview" ref="928520650"/> - <int key="NSTag">33000</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="697431051"> - <int key="NSCellFlags">-2080244224</int> - <int key="NSCellFlags2">134250496</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="64724822"/> - <int key="NSTag">-2</int> - <reference key="NSControlView" ref="634265909"/> - <int key="NSButtonFlags">-2030288641</int> - <int key="NSButtonFlags2">6</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">back_Template</string> - </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - </object> - </object> - <object class="NSButton" id="480525277"> - <reference key="NSNextResponder" ref="928520650"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{171, 0}, {29, 27}}</string> - <reference key="NSSuperview" ref="928520650"/> - <int key="NSTag">33004</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="203834804"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134250496</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="64724822"/> - <int key="NSTag">1</int> - <reference key="NSControlView" ref="480525277"/> - <int key="NSButtonFlags">-2031337217</int> - <int key="NSButtonFlags2">6</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">omnibox_search</string> - </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - </object> - </object> - <object class="NSButton" id="61075550"> - <reference key="NSNextResponder" ref="928520650"/> - <int key="NSvFlags">-2147483383</int> - <string key="NSFrame">{{769, 0}, {28, 28}}</string> - <reference key="NSSuperview" ref="928520650"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="782055404"> - <int key="NSCellFlags">-2080244224</int> - <int key="NSCellFlags2">134250496</int> - <string key="NSContents"/> - <object class="NSFont" key="NSSupport"> - <string key="NSName">Helvetica</string> - <double key="NSSize">1.300000e+01</double> - <int key="NSfFlags">16</int> - </object> - <reference key="NSControlView" ref="61075550"/> - <int key="NSButtonFlags">138690815</int> - <int key="NSButtonFlags2">6</int> - <object class="NSCustomResource" key="NSNormalImage" id="604193990"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">omnibox_star</string> - </object> - <reference key="NSAlternateImage" ref="604193990"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - </object> - </object> - <object class="NSButton" id="563352512"> - <reference key="NSNextResponder" ref="928520650"/> - <int key="NSvFlags">265</int> - <string key="NSFrame">{{829, 4}, {154, 19}}</string> - <reference key="NSSuperview" ref="928520650"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="721941787"> - <int key="NSCellFlags">-2080244224</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">www.example.com</string> - <object class="NSFont" key="NSSupport"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.200000e+01</double> - <int key="NSfFlags">16</int> - </object> - <reference key="NSControlView" ref="563352512"/> - <int key="NSButtonFlags">-2038152961</int> - <int key="NSButtonFlags2">164</int> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - </object> - </object> - <object class="NSProgressIndicator" id="878327800"> - <reference key="NSNextResponder" ref="928520650"/> - <int key="NSvFlags">1289</int> - <object class="NSPSMatrix" key="NSDrawMatrix"/> - <string key="NSFrame">{{805, 7}, {16, 16}}</string> - <reference key="NSSuperview" ref="928520650"/> - <int key="NSpiFlags">28938</int> - <double key="NSMinValue">1.600000e+01</double> - <double key="NSMaxValue">1.000000e+02</double> - </object> - <object class="NSTextField" id="129480691"> - <reference key="NSNextResponder" ref="928520650"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{332, 7}, {380, 15}}</string> - <reference key="NSSuperview" ref="928520650"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="904879814"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents">Example title for this site</string> - <object class="NSFont" key="NSSupport"> - <string key="NSName">Helvetica</string> - <double key="NSSize">1.200000e+01</double> - <int key="NSfFlags">16</int> - </object> - <reference key="NSControlView" ref="129480691"/> - <object class="NSColor" key="NSBackgroundColor"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">controlColor</string> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes> - </object> - </object> - <object class="NSColor" key="NSTextColor"> - <int key="NSColorSpace">4</int> - <bytes key="NSWhite">MCAwLjUAA</bytes> - </object> - </object> - </object> - </object> - <string key="NSFrameSize">{995, 28}</string> - <reference key="NSSuperview"/> - <string key="NSClassName">ToolbarView</string> - </object> - <object class="NSCustomObject" id="1044322163"> - <string key="NSClassName">ChromeUILocalizer</string> - </object> - </object> - <object class="IBObjectContainer" key="IBDocument.Objects"> - <object class="NSMutableArray" key="connectionRecords"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">backButton_</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="634265909"/> - </object> - <int key="connectionID">17</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">forwardButton_</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="781044416"/> - </object> - <int key="connectionID">18</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">reloadButton_</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="458854861"/> - </object> - <int key="connectionID">19</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">goButton_</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="480525277"/> - </object> - <int key="connectionID">21</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">view</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="928520650"/> - </object> - <int key="connectionID">22</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">commandDispatch:</string> - <reference key="source" ref="1003"/> - <reference key="destination" ref="535508469"/> - </object> - <int key="connectionID">24</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">commandDispatchUsingKeyModifiers:</string> - <reference key="source" ref="1003"/> - <reference key="destination" ref="458854861"/> - </object> - <int key="connectionID">26</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">commandDispatch:</string> - <reference key="source" ref="1003"/> - <reference key="destination" ref="480525277"/> - </object> - <int key="connectionID">29</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">locationBar_</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="535508469"/> - </object> - <int key="connectionID">31</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">homeButton_</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="368496192"/> - </object> - <int key="connectionID">35</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">owner_</string> - <reference key="source" ref="1044322163"/> - <reference key="destination" ref="1001"/> - </object> - <int key="connectionID">123</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">commandDispatchUsingKeyModifiers:</string> - <reference key="source" ref="1003"/> - <reference key="destination" ref="634265909"/> - </object> - <int key="connectionID">138</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">commandDispatchUsingKeyModifiers:</string> - <reference key="source" ref="1003"/> - <reference key="destination" ref="781044416"/> - </object> - <int key="connectionID">139</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">browserActionsContainerView_</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="421615633"/> - </object> - <int key="connectionID">154</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">commandDispatchUsingKeyModifiers:</string> - <reference key="source" ref="1003"/> - <reference key="destination" ref="368496192"/> - </object> - <int key="connectionID">155</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">starButton_</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="61075550"/> - </object> - <int key="connectionID">161</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">title_</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="129480691"/> - </object> - <int key="connectionID">164</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">loadingSpinner_</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="878327800"/> - </object> - <int key="connectionID">165</int> - </object> - </object> - <object class="IBMutableOrderedSet" key="objectRecords"> - <object class="NSArray" key="orderedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBObjectRecord"> - <int key="objectID">0</int> - <object class="NSArray" key="object" id="368102878"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <reference key="children" ref="1000"/> - <nil key="parent"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">-2</int> - <reference key="object" ref="1001"/> - <reference key="parent" ref="368102878"/> - <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">-1</int> - <reference key="object" ref="1003"/> - <reference key="parent" ref="368102878"/> - <string key="objectName">First Responder</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">-3</int> - <reference key="object" ref="1004"/> - <reference key="parent" ref="368102878"/> - <string key="objectName">Application</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">1</int> - <reference key="object" ref="928520650"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="421615633"/> - <reference ref="535508469"/> - <reference ref="480525277"/> - <reference ref="368496192"/> - <reference ref="458854861"/> - <reference ref="781044416"/> - <reference ref="634265909"/> - <reference ref="61075550"/> - <reference ref="563352512"/> - <reference ref="878327800"/> - <reference ref="129480691"/> - </object> - <reference key="parent" ref="368102878"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">2</int> - <reference key="object" ref="634265909"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="697431051"/> - </object> - <reference key="parent" ref="928520650"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">3</int> - <reference key="object" ref="458854861"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="386107000"/> - </object> - <reference key="parent" ref="928520650"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">4</int> - <reference key="object" ref="535508469"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="464583340"/> - </object> - <reference key="parent" ref="928520650"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5</int> - <reference key="object" ref="480525277"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="203834804"/> - </object> - <reference key="parent" ref="928520650"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7</int> - <reference key="object" ref="781044416"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="3781855"/> - </object> - <reference key="parent" ref="928520650"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">8</int> - <reference key="object" ref="368496192"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="760046712"/> - </object> - <reference key="parent" ref="928520650"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">9</int> - <reference key="object" ref="760046712"/> - <reference key="parent" ref="368496192"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">10</int> - <reference key="object" ref="3781855"/> - <reference key="parent" ref="781044416"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">12</int> - <reference key="object" ref="203834804"/> - <reference key="parent" ref="480525277"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">13</int> - <reference key="object" ref="464583340"/> - <reference key="parent" ref="535508469"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">14</int> - <reference key="object" ref="386107000"/> - <reference key="parent" ref="458854861"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">15</int> - <reference key="object" ref="697431051"/> - <reference key="parent" ref="634265909"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">122</int> - <reference key="object" ref="1044322163"/> - <reference key="parent" ref="368102878"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">144</int> - <reference key="object" ref="421615633"/> - <reference key="parent" ref="928520650"/> - <string key="objectName">Browser Actions Container</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">156</int> - <reference key="object" ref="61075550"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="782055404"/> - </object> - <reference key="parent" ref="928520650"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">157</int> - <reference key="object" ref="782055404"/> - <reference key="parent" ref="61075550"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">158</int> - <reference key="object" ref="563352512"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="721941787"/> - </object> - <reference key="parent" ref="928520650"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">159</int> - <reference key="object" ref="878327800"/> - <reference key="parent" ref="928520650"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">160</int> - <reference key="object" ref="721941787"/> - <reference key="parent" ref="563352512"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">162</int> - <reference key="object" ref="129480691"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="904879814"/> - </object> - <reference key="parent" ref="928520650"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">163</int> - <reference key="object" ref="904879814"/> - <reference key="parent" ref="129480691"/> - </object> - </object> - </object> - <object class="NSMutableDictionary" key="flattenedProperties"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>-1.IBPluginDependency</string> - <string>-2.IBPluginDependency</string> - <string>-3.IBPluginDependency</string> - <string>1.IBEditorWindowLastContentRect</string> - <string>1.IBPluginDependency</string> - <string>1.IBViewEditorWindowController.showingLayoutRectangles</string> - <string>10.CustomClassName</string> - <string>10.IBPluginDependency</string> - <string>12.CustomClassName</string> - <string>12.IBPluginDependency</string> - <string>122.IBPluginDependency</string> - <string>13.CustomClassName</string> - <string>13.IBPluginDependency</string> - <string>14.CustomClassName</string> - <string>14.IBPluginDependency</string> - <string>144.IBPluginDependency</string> - <string>15.CustomClassName</string> - <string>15.IBPluginDependency</string> - <string>156.IBPluginDependency</string> - <string>157.IBPluginDependency</string> - <string>158.IBPluginDependency</string> - <string>159.IBPluginDependency</string> - <string>160.IBPluginDependency</string> - <string>162.IBPluginDependency</string> - <string>163.IBPluginDependency</string> - <string>2.CustomClassName</string> - <string>2.IBAttributePlaceholdersKey</string> - <string>2.IBPluginDependency</string> - <string>3.IBAttributePlaceholdersKey</string> - <string>3.IBPluginDependency</string> - <string>4.CustomClassName</string> - <string>4.IBPluginDependency</string> - <string>5.IBPluginDependency</string> - <string>7.CustomClassName</string> - <string>7.IBAttributePlaceholdersKey</string> - <string>7.IBPluginDependency</string> - <string>8.IBAttributePlaceholdersKey</string> - <string>8.IBPluginDependency</string> - <string>9.CustomClassName</string> - <string>9.IBPluginDependency</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{76, 573}, {995, 28}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>ClickHoldButtonCell</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>GradientButtonCell</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>AutocompleteTextFieldCell</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>GradientButtonCell</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>ClickHoldButtonCell</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>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>DelayedMenuButton</string> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="634265909"/> - <string key="toolTip">^IDS_TOOLTIP_BACK</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="458854861"/> - <string key="toolTip">^IDS_TOOLTIP_RELOAD</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>AutocompleteTextField</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>DelayedMenuButton</string> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="781044416"/> - <string key="toolTip">^IDS_TOOLTIP_FORWARD</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="368496192"/> - <string key="toolTip">^IDS_TOOLTIP_HOME</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>GradientButtonCell</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - </object> - </object> - <object class="NSMutableDictionary" key="unlocalizedProperties"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - </object> - <nil key="activeLocalization"/> - <object class="NSMutableDictionary" key="localizations"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - </object> - <nil key="sourceID"/> - <int key="maxID">165</int> - </object> - <object class="IBClassDescriber" key="IBDocument.Classes"> - <object class="NSMutableArray" key="referencedPartialClassDescriptions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBPartialClassDescription"> - <string key="className">AutocompleteTextField</string> - <string key="superclassName">StyledTextField</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/autocomplete_text_field.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">AutocompleteTextFieldCell</string> - <string key="superclassName">StyledTextFieldCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/autocomplete_text_field_cell.h</string> - </object> - </object> - <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">BrowserActionsContainerView</string> - <string key="superclassName">NSView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/extensions/browser_actions_container_view.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">ChromeUILocalizer</string> - <string key="superclassName">GTMUILocalizer</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/ui_localizer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">ClickHoldButtonCell</string> - <string key="superclassName">GradientButtonCell</string> - <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">clickHoldTarget_</string> - <string key="NS.object.0">id</string> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/clickhold_button_cell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">DelayedMenuButton</string> - <string key="superclassName">NSButton</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/delayedmenu_button.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">FirstResponder</string> - <string key="superclassName">NSObject</string> - <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>commandDispatch:</string> - <string>commandDispatchUsingKeyModifiers:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBUserSource</string> - <string key="minorKey"/> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">GTMUILocalizer</string> - <string key="superclassName">NSObject</string> - <object class="NSMutableDictionary" key="outlets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" 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> - <string>id</string> - <string>id</string> - <string>id</string> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizer.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">GradientButtonCell</string> - <string key="superclassName">NSButtonCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/gradient_button_cell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">MenuButton</string> - <string key="superclassName">NSButton</string> - <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">attachedMenu_</string> - <string key="NS.object.0">NSMenu</string> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/menu_button.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> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/objc_zombie.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">browser/cocoa/status_bubble_mac.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">browser/cocoa/tab_strip_model_observer_bridge.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">SideTabsToolbarController</string> - <string key="superclassName">ToolbarController</string> - <object class="NSMutableDictionary" key="outlets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>loadingSpinner_</string> - <string>starButton_</string> - <string>title_</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSProgressIndicator</string> - <string>NSButton</string> - <string>NSTextField</string> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier" id="530688347"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/toolbar_controller.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">StyledTextField</string> - <string key="superclassName">NSTextField</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/styled_text_field.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">StyledTextFieldCell</string> - <string key="superclassName">NSTextFieldCell</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/styled_text_field_cell.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">ToolbarController</string> - <string key="superclassName">NSViewController</string> - <object class="NSMutableDictionary" key="outlets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>backButton_</string> - <string>browserActionsContainerView_</string> - <string>forwardButton_</string> - <string>goButton_</string> - <string>homeButton_</string> - <string>locationBar_</string> - <string>pageButton_</string> - <string>reloadButton_</string> - <string>resizeDelegate_</string> - <string>wrenchButton_</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>DelayedMenuButton</string> - <string>BrowserActionsContainerView</string> - <string>DelayedMenuButton</string> - <string>NSButton</string> - <string>NSButton</string> - <string>AutocompleteTextField</string> - <string>MenuButton</string> - <string>NSButton</string> - <string>id</string> - <string>MenuButton</string> - </object> - </object> - <reference key="sourceIdentifier" ref="530688347"/> - </object> - <object class="IBPartialClassDescription"> - <string key="className">ToolbarView</string> - <string key="superclassName">BackgroundGradientView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/toolbar_view.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">ToolbarView</string> - <string key="superclassName">BackgroundGradientView</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBUserSource</string> - <string key="minorKey"/> - </object> - </object> - </object> - </object> - <int key="IBDocument.localizationMode">0</int> - <string key="IBDocument.LastKnownRelativeProjectPath">../../chrome.xcodeproj</string> - <int key="IBDocument.defaultPropertyAccessControl">3</int> - </data> -</archive> diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm index 4b57df7..d189313 100644 --- a/chrome/browser/cocoa/browser_window_controller.mm +++ b/chrome/browser/cocoa/browser_window_controller.mm @@ -256,7 +256,15 @@ // and the toolbar view from the nib. The controller will handle // registering for the appropriate command state changes from the back-end. // Adds the toolbar to the content area. - [self initializeToolbarWithBrowser:browser]; + toolbarController_.reset([[ToolbarController alloc] + initWithModel:browser->toolbar_model() + commands:browser->command_updater() + profile:browser->profile() + browser:browser + resizeDelegate:self]); + [toolbarController_ setHasToolbar:[self hasToolbar] + hasLocationBar:[self hasLocationBar]]; + [[[self window] contentView] addSubview:[toolbarController_ view]]; // Create a sub-controller for the bookmark bar. bookmarkBarController_.reset( @@ -1635,7 +1643,7 @@ willAnimateFromState:(bookmarks::VisualState)oldState // Right now, it only switches one direction, which clearly isn't cool. // [self initTabStrip:browser_->tabstrip_model()]; [[self tabStripView] removeFromSuperview]; - [self initializeToolbarWithBrowser:browser_.get()]; + [self layoutSubviews]; } diff --git a/chrome/browser/cocoa/browser_window_controller_private.h b/chrome/browser/cocoa/browser_window_controller_private.h index 29bd3c6..19573bd 100644 --- a/chrome/browser/cocoa/browser_window_controller_private.h +++ b/chrome/browser/cocoa/browser_window_controller_private.h @@ -50,7 +50,9 @@ // Lays out the toolbar (or just location bar for popups) at the given maximum // y-coordinate, with the given width; returns the new maximum y (below the // toolbar). -- (CGFloat)layoutToolbarAtMaxY:(CGFloat)maxY width:(CGFloat)width; +- (CGFloat)layoutToolbarAtMinX:(CGFloat)minX + maxY:(CGFloat)maxY + width:(CGFloat)width; // Returns YES if the bookmark bar should be placed below the infobar, NO // otherwise. @@ -109,10 +111,6 @@ - (void)enableBarVisibilityUpdates; - (void)disableBarVisibilityUpdates; -// Removes existing toolbar and re-creates the appropriate toolbar controller -// based on if vertical tabs are enabled. -- (void)initializeToolbarWithBrowser:(Browser*)browser; - @end // @interface BrowserWindowController(Private) diff --git a/chrome/browser/cocoa/browser_window_controller_private.mm b/chrome/browser/cocoa/browser_window_controller_private.mm index 13cf6b8..2c707a1 100644 --- a/chrome/browser/cocoa/browser_window_controller_private.mm +++ b/chrome/browser/cocoa/browser_window_controller_private.mm @@ -15,7 +15,6 @@ #import "chrome/browser/cocoa/find_bar_cocoa_controller.h" #import "chrome/browser/cocoa/floating_bar_backing_view.h" #import "chrome/browser/cocoa/fullscreen_controller.h" -#import "chrome/browser/cocoa/side_tabs_toolbar_controller.h" #import "chrome/browser/cocoa/tab_strip_controller.h" #import "chrome/browser/cocoa/tab_strip_view.h" #import "chrome/browser/cocoa/toolbar_controller.h" @@ -171,12 +170,7 @@ willPositionSheet:(NSWindow*)sheet DCHECK_GE(maxY, minY); DCHECK_LE(maxY, NSMaxY(contentBounds) + yOffset); - // Place the toolbar at the top of the reserved area. Even with vertical - // tabs enabled, the toolbar takes up the entire top width. - maxY = [self layoutToolbarAtMaxY:maxY width:width]; - - // Position the vertical tab strip on the left, taking up the entire remaining - // height. + // Position the vertical tab strip on the left, taking up the entire height. // TODO(pinkerton): Make width not fixed. const CGFloat kSidebarWidth = 200.0; if ([self useVerticalTabs]) { @@ -188,7 +182,10 @@ willPositionSheet:(NSWindow*)sheet width -= kSidebarWidth; } - // If we're not displaying the bookmark bar below the infobar, then it goes + // Place the toolbar at the top of the reserved area. + maxY = [self layoutToolbarAtMinX:minX maxY:maxY width:width]; + + // If we're not displaying the bookmark bar below the infobar, then it goes // immediately below the toolbar. BOOL placeBookmarkBarBelowInfoBar = [self placeBookmarkBarBelowInfoBar]; if (!placeBookmarkBarBelowInfoBar) @@ -288,13 +285,15 @@ willPositionSheet:(NSWindow*)sheet return maxY; } -- (CGFloat)layoutToolbarAtMaxY:(CGFloat)maxY width:(CGFloat)width { +- (CGFloat)layoutToolbarAtMinX:(CGFloat)minX + maxY:(CGFloat)maxY + width:(CGFloat)width { NSView* toolbarView = [toolbarController_ view]; NSRect toolbarFrame = [toolbarView frame]; if ([self hasToolbar]) { // The toolbar is present in the window, so we make room for it. DCHECK(![toolbarView isHidden]); - toolbarFrame.origin.x = 0; + toolbarFrame.origin.x = minX; toolbarFrame.origin.y = maxY - NSHeight(toolbarFrame); toolbarFrame.size.width = width; maxY -= NSHeight(toolbarFrame); @@ -495,32 +494,4 @@ willPositionSheet:(NSWindow*)sheet [fullscreenController_ cancelAnimationAndTimers]; } -// Removes existing toolbar and re-creates the appropriate toolbar controller -// based on if vertical tabs are enabled. -- (void)initializeToolbarWithBrowser:(Browser*)browser { - // Remove existing view. - [[toolbarController_ view] removeFromSuperview]; - toolbarController_.reset(nil); - - // Create appropriate toolbar controller. - if ([self useVerticalTabs]) { - toolbarController_.reset([[SideTabsToolbarController alloc] - initWithModel:browser->toolbar_model() - commands:browser->command_updater() - profile:browser->profile() - browser:browser - resizeDelegate:self]); - } else { - toolbarController_.reset([[ToolbarController alloc] - initWithModel:browser->toolbar_model() - commands:browser->command_updater() - profile:browser->profile() - browser:browser - resizeDelegate:self]); - } - [toolbarController_ setHasToolbar:[self hasToolbar] - hasLocationBar:[self hasLocationBar]]; - [[[self window] contentView] addSubview:[toolbarController_ view]]; -} - @end // @implementation BrowserWindowController(Private) diff --git a/chrome/browser/cocoa/side_tabs_toolbar_controller.h b/chrome/browser/cocoa/side_tabs_toolbar_controller.h deleted file mode 100644 index 9516262..0000000 --- a/chrome/browser/cocoa/side_tabs_toolbar_controller.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_COCOA_SIDE_TABS_TOOLBAR_CONTROLLER_H_ -#define CHROME_BROWSER_COCOA_SIDE_TABS_TOOLBAR_CONTROLLER_H_ - -#import <Cocoa/Cocoa.h> - -#import "chrome/browser/cocoa/toolbar_controller.h" - -// A toolbar controller for when there are side tabs. -// TODO(pinkerton): needs to be fleshed out much more and refactored. It -// probably should not be a subclass, but the ToolbarController factored into -// a base class. This, however, works for now. - -@interface SideTabsToolbarController : ToolbarController { - @private - // TODO(shess): |goButton_| no longer exists in ToolbarController. - // It's not clear to me that |goButton_| is the right name for this - // class to use. - IBOutlet NSButton* goButton_; - IBOutlet NSButton* starButton_; - IBOutlet NSTextField* title_; - IBOutlet NSProgressIndicator* loadingSpinner_; -} - -@end - -#endif // CHROME_BROWSER_COCOA_SIDE_TABS_TOOLBAR_CONTROLLER_H_ diff --git a/chrome/browser/cocoa/side_tabs_toolbar_controller.mm b/chrome/browser/cocoa/side_tabs_toolbar_controller.mm deleted file mode 100644 index 989538d..0000000 --- a/chrome/browser/cocoa/side_tabs_toolbar_controller.mm +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#import "chrome/browser/cocoa/side_tabs_toolbar_controller.h" - -#include "base/nsimage_cache_mac.h" -#import "chrome/browser/cocoa/autocomplete_text_field_cell.h" -#include "chrome/browser/browser.h" -#include "chrome/browser/profile.h" - - -namespace { - -NSString* const kSearchButtonImageName = @"omnibox_search.pdf"; - -} - -@implementation SideTabsToolbarController - -- (id)initWithModel:(ToolbarModel*)model - commands:(CommandUpdater*)commands - profile:(Profile*)profile - browser:(Browser*)browser - resizeDelegate:(id<ViewResizer>)resizeDelegate { - if ((self = [super initWithModel:model - commands:commands - profile:profile - browser:browser - resizeDelegate:resizeDelegate - nibFileNamed:@"SideToolbar"])) { - } - return self; -} - -- (void)awakeFromNib { - [super awakeFromNib]; - // TODO(shess): |goButton_| is no longer in |ToolbarController|. - // AFAICT this code partially implements a new feature (see - // http://crbug.com/44773) which may be in conflict with - // http://crbug.com/45762 . - [goButton_ setImage:nsimage_cache::ImageNamed(kSearchButtonImageName)]; - [[locationBar_ autocompleteTextFieldCell] setStarIconView:nil]; -} - -- (void)showOptionalHomeButton { - // Do nothing for side tabs. -} - -- (void)setIsLoading:(BOOL)isLoading { - if (isLoading) - [loadingSpinner_ startAnimation:self]; - else - [loadingSpinner_ stopAnimation:self]; -} - -@end diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 3714b39..608fc8e 100755 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -851,8 +851,6 @@ 'browser/cocoa/search_engine_list_model.h', 'browser/cocoa/search_engine_list_model.mm', 'browser/cocoa/shell_dialogs_mac.mm', - 'browser/cocoa/side_tabs_toolbar_controller.h', - 'browser/cocoa/side_tabs_toolbar_controller.mm', 'browser/cocoa/status_bubble_mac.h', 'browser/cocoa/status_bubble_mac.mm', 'browser/cocoa/status_icons/status_icon_mac.h', @@ -2921,7 +2919,6 @@ 'app/nibs/ReportBug.xib', 'app/nibs/SadTab.xib', 'app/nibs/SaveAccessoryView.xib', - 'app/nibs/SideToolbar.xib', 'app/nibs/SyncCustomize.xib', 'app/nibs/TaskManager.xib', 'app/nibs/Toolbar.xib', diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index eced91f..16c9e2a 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -236,7 +236,6 @@ 'app/nibs/Preferences.xib', 'app/nibs/ReportBug.xib', 'app/nibs/SaveAccessoryView.xib', - 'app/nibs/SideToolbar.xib', 'app/nibs/SadTab.xib', 'app/nibs/SyncCustomize.xib', 'app/nibs/TabContents.xib', |