diff options
author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-27 19:47:51 +0000 |
---|---|---|
committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-27 19:47:51 +0000 |
commit | f11695a0b2eeb605fa9f21bcf5c991ef1bcc765a (patch) | |
tree | 06a498cba9bd9bdc841498f79f2badcb72454b85 /chrome/app | |
parent | 81e6378c98d0e69339302527eb1de4735d1e2c3f (diff) | |
download | chromium_src-f11695a0b2eeb605fa9f21bcf5c991ef1bcc765a.zip chromium_src-f11695a0b2eeb605fa9f21bcf5c991ef1bcc765a.tar.gz chromium_src-f11695a0b2eeb605fa9f21bcf5c991ef1bcc765a.tar.bz2 |
Add "stop" image to project. Clean up project so app/theme is a proper group and its children could be relative to it rather than their grandparent. Plumb loading status into Mac controllers. Add more loading status info to stub TabContents. Make browser window a little taller and wider so NTP didn't show scrollbars.
Review URL: http://codereview.chromium.org/31017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r-- | chrome/app/nibs/English.lproj/BrowserWindow.xib | 24 | ||||
-rw-r--r-- | chrome/app/nibs/English.lproj/TabContents.xib | 32 | ||||
-rw-r--r-- | chrome/app/theme/stop.pdf | bin | 0 -> 2291 bytes |
3 files changed, 34 insertions, 22 deletions
diff --git a/chrome/app/nibs/English.lproj/BrowserWindow.xib b/chrome/app/nibs/English.lproj/BrowserWindow.xib index 9dd9841..42a88a2 100644 --- a/chrome/app/nibs/English.lproj/BrowserWindow.xib +++ b/chrome/app/nibs/English.lproj/BrowserWindow.xib @@ -2,12 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9G55</string> + <string key="IBDocument.SystemVersion">9F33</string> <string key="IBDocument.InterfaceBuilderVersion">677</string> - <string key="IBDocument.AppKitVersion">949.43</string> - <string key="IBDocument.HIToolboxVersion">353.00</string> + <string key="IBDocument.AppKitVersion">949.34</string> + <string key="IBDocument.HIToolboxVersion">352.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> @@ -36,14 +37,14 @@ <object class="NSWindowTemplate" id="1005"> <int key="NSWindowStyleMask">4359</int> <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{60, 229}, {720, 578}}</string> + <string key="NSWindowRect">{{60, 229}, {750, 600}}</string> <int key="NSWTFlags">536870912</int> <string key="NSWindowTitle"/> <string key="NSWindowClass">NSWindow</string> <nil key="NSViewClass"/> <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <object class="NSView" key="NSWindowView" id="1006"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -55,11 +56,11 @@ <object class="NSView" id="734052543"> <reference key="NSNextResponder" ref="332491870"/> <int key="NSvFlags">256</int> - <string key="NSFrameSize">{720, 564}</string> + <string key="NSFrameSize">{750, 586}</string> <reference key="NSSuperview" ref="332491870"/> </object> </object> - <string key="NSFrameSize">{720, 564}</string> + <string key="NSFrameSize">{750, 586}</string> <reference key="NSSuperview" ref="1006"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> @@ -92,7 +93,8 @@ <bool key="NSTransparent">NO</bool> </object> </object> - <string key="NSFrameSize">{720, 578}</string> + <string key="NSFrameSize">{750, 600}</string> + <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> @@ -231,9 +233,9 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{136, 278}, {720, 578}}</string> + <string>{{136, 256}, {750, 600}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{136, 278}, {720, 578}}</string> + <string>{{136, 256}, {750, 600}}</string> <boolean value="NO"/> <string>{196, 240}</string> <string>{{357, 418}, {480, 270}}</string> @@ -297,7 +299,7 @@ </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/browser_window_controller.h</string> + <string key="minorKey">browser/cocoa/browser_window_controller.h</string> </object> </object> <object class="IBPartialClassDescription"> diff --git a/chrome/app/nibs/English.lproj/TabContents.xib b/chrome/app/nibs/English.lproj/TabContents.xib index 3d6bf8a..217660b 100644 --- a/chrome/app/nibs/English.lproj/TabContents.xib +++ b/chrome/app/nibs/English.lproj/TabContents.xib @@ -8,7 +8,7 @@ <string key="IBDocument.HIToolboxVersion">352.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="94"/> + <integer value="164"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -431,14 +431,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">reloadStopButton_</string> - <reference key="source" ref="326691890"/> - <reference key="destination" ref="1046981093"/> - </object> - <int key="connectionID">167</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">starButton_</string> <reference key="source" ref="326691890"/> <reference key="destination" ref="574811940"/> @@ -461,6 +453,22 @@ </object> <int key="connectionID">176</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">reloadButton_</string> + <reference key="source" ref="326691890"/> + <reference key="destination" ref="1046981093"/> + </object> + <int key="connectionID">177</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">goButton_</string> + <reference key="source" ref="326691890"/> + <reference key="destination" ref="742185090"/> + </object> + <int key="connectionID">178</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -735,7 +743,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">176</int> + <int key="maxID">178</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -774,9 +782,10 @@ <string>backButton_</string> <string>contentsBox_</string> <string>forwardButton_</string> + <string>goButton_</string> <string>growBox_</string> <string>locationBar_</string> - <string>reloadStopButton_</string> + <string>reloadButton_</string> <string>starButton_</string> </object> <object class="NSMutableArray" key="dict.values"> @@ -784,6 +793,7 @@ <string>NSButton</string> <string>NSBox</string> <string>NSButton</string> + <string>NSButton</string> <string>GrowBoxView</string> <string>NSTextField</string> <string>NSButton</string> diff --git a/chrome/app/theme/stop.pdf b/chrome/app/theme/stop.pdf Binary files differnew file mode 100644 index 0000000..a03f612 --- /dev/null +++ b/chrome/app/theme/stop.pdf |