diff options
author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 15:07:52 +0000 |
---|---|---|
committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 15:07:52 +0000 |
commit | 0711b7a78082250b9fb18835e8bf12e9d3f5d749 (patch) | |
tree | 5399362082bfff1bc65713f66751995b3e686968 | |
parent | 63df3733f2f453c732d9da60bf26996859779f37 (diff) | |
download | chromium_src-0711b7a78082250b9fb18835e8bf12e9d3f5d749.zip chromium_src-0711b7a78082250b9fb18835e8bf12e9d3f5d749.tar.gz chromium_src-0711b7a78082250b9fb18835e8bf12e9d3f5d749.tar.bz2 |
Hung Renderer dialog:
Resize to fit the graphic.
Fetch the hung from ResourceBundle since it looks like it should be under theme control.
Swap the kill and wait buttons.
Add in localization objects.
Resize message and window to find localized content.
Bookmark Bubble:
Right align labels to fields.
Make window resize to fit labels.
Switch to small controls per Cole.
Stop bringing the frozen tab graphic into the bundle so we avoid the extra copy.
BUG=20525
BUG=20533
TEST=Hung renderer localized and fits content. Bookmark bubble fits labels in all languages.
Review URL: http://codereview.chromium.org/193020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25452 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/app/nibs/BookmarkBubble.xib | 719 | ||||
-rw-r--r-- | chrome/app/nibs/HungRendererDialog.xib | 348 | ||||
-rw-r--r-- | chrome/browser/cocoa/hung_renderer_controller.h | 2 | ||||
-rw-r--r-- | chrome/browser/cocoa/hung_renderer_controller.mm | 38 | ||||
-rw-r--r-- | chrome/chrome.gyp | 3 |
5 files changed, 735 insertions, 375 deletions
diff --git a/chrome/app/nibs/BookmarkBubble.xib b/chrome/app/nibs/BookmarkBubble.xib index 6e75d5b..7d144df 100644 --- a/chrome/app/nibs/BookmarkBubble.xib +++ b/chrome/app/nibs/BookmarkBubble.xib @@ -2,13 +2,13 @@ <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.SystemVersion">9L30</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"/> + <integer value="39"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -42,7 +42,7 @@ <object class="NSTextField" id="559397096"> <reference key="NSNextResponder" ref="1005"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 121}, {244, 19}}</string> + <string key="NSFrame">{{17, 106}, {340, 19}}</string> <reference key="NSSuperview" ref="1005"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="368795405"> @@ -51,8 +51,8 @@ <string key="NSContents">^IDS_BOOMARK_BUBBLE_PAGE_BOOKMARK</string> <object class="NSFont" key="NSSupport"> <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.600000e+01</double> - <int key="NSfFlags">16</int> + <double key="NSSize">1.300000e+01</double> + <int key="NSfFlags">1044</int> </object> <reference key="NSControlView" ref="559397096"/> <object class="NSColor" key="NSBackgroundColor" id="152587692"> @@ -75,236 +75,304 @@ </object> </object> </object> - <object class="NSTextField" id="303910295"> + <object class="NSCustomView" id="46287572"> <reference key="NSNextResponder" ref="1005"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 87}, {65, 17}}</string> - <reference key="NSSuperview" ref="1005"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="628112279"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents">^IDS_BOOMARK_BUBBLE_TITLE_TEXT</string> - <object class="NSFont" key="NSSupport" id="714614853"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.300000e+01</double> - <int key="NSfFlags">1044</int> + <int key="NSvFlags">289</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="82356437"> + <reference key="NSNextResponder" ref="46287572"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{111, 13}, {96, 28}}</string> + <reference key="NSSuperview" ref="46287572"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="307931553"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134348800</int> + <string key="NSContents">^IDS_CLOSE</string> + <object class="NSFont" key="NSSupport" id="26"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">1.100000e+01</double> + <int key="NSfFlags">3100</int> + </object> + <reference key="NSControlView" ref="82356437"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">129</int> + <string key="NSAlternateContents"/> + <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="430629007"> + <reference key="NSNextResponder" ref="46287572"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{15, 13}, {96, 28}}</string> + <reference key="NSSuperview" ref="46287572"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="562929863"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134348800</int> + <string key="NSContents">^IDS_BOOMARK_BUBBLE_OPTIONS</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="430629007"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">129</int> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> </object> - <reference key="NSControlView" ref="303910295"/> - <reference key="NSBackgroundColor" ref="152587692"/> - <reference key="NSTextColor" ref="1000275559"/> </object> + <string key="NSFrame">{{152, 0}, {222, 42}}</string> + <reference key="NSSuperview" ref="1005"/> + <string key="NSClassName">GTMWidthBasedTweaker</string> </object> - <object class="NSTextField" id="228609717"> + <object class="NSCustomView" id="209382123"> <reference key="NSNextResponder" ref="1005"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 62}, {65, 17}}</string> - <reference key="NSSuperview" ref="1005"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="295393049"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents">^IDS_BOOMARK_BUBBLE_FOLDER_TEXT</string> - <reference key="NSSupport" ref="714614853"/> - <reference key="NSControlView" ref="228609717"/> - <reference key="NSBackgroundColor" ref="152587692"/> - <reference key="NSTextColor" ref="1000275559"/> + <int key="NSvFlags">292</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="177936093"> + <reference key="NSNextResponder" ref="209382123"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{15, 13}, {96, 28}}</string> + <reference key="NSSuperview" ref="209382123"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="1066753170"> + <int key="NSCellFlags">-2080244224</int> + <int key="NSCellFlags2">134348800</int> + <string key="NSContents">^IDS_BOOMARK_BUBBLE_REMOVE_BOOKMARK</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="177936093"/> + <int key="NSButtonFlags">-2038021889</int> + <int key="NSButtonFlags2">129</int> + <object class="NSFont" key="NSAlternateImage"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">1.100000e+01</double> + <int key="NSfFlags">16</int> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">400</int> + <int key="NSPeriodicInterval">75</int> + </object> + </object> </object> + <string key="NSFrameSize">{126, 42}</string> + <reference key="NSSuperview" ref="1005"/> + <string key="NSClassName">GTMWidthBasedTweaker</string> </object> - <object class="NSTextField" id="39428350"> + <object class="NSCustomView" id="900754038"> <reference key="NSNextResponder" ref="1005"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{87, 85}, {267, 22}}</string> - <reference key="NSSuperview" ref="1005"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="905670292"> - <int key="NSCellFlags">-1804468671</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="714614853"/> - <reference key="NSControlView" ref="39428350"/> - <bool key="NSDrawsBackground">YES</bool> - <object class="NSColor" key="NSBackgroundColor" id="1033293763"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">textBackgroundColor</string> - <object class="NSColor" key="NSColor" id="660986653"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MQA</bytes> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="303910295"> + <reference key="NSNextResponder" ref="900754038"/> + <int key="NSvFlags">265</int> + <string key="NSFrame">{{17, 31}, {65, 14}}</string> + <reference key="NSSuperview" ref="900754038"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="628112279"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272761856</int> + <string key="NSContents">^IDS_BOOMARK_BUBBLE_TITLE_TEXT</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="303910295"/> + <reference key="NSBackgroundColor" ref="152587692"/> + <reference key="NSTextColor" ref="1000275559"/> </object> </object> - <object class="NSColor" key="NSTextColor"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">textColor</string> - <reference key="NSColor" ref="947148753"/> + <object class="NSTextField" id="228609717"> + <reference key="NSNextResponder" ref="900754038"/> + <int key="NSvFlags">265</int> + <string key="NSFrame">{{17, 6}, {65, 14}}</string> + <reference key="NSSuperview" ref="900754038"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="295393049"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272761856</int> + <string key="NSContents">^IDS_BOOMARK_BUBBLE_FOLDER_TEXT</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="228609717"/> + <reference key="NSBackgroundColor" ref="152587692"/> + <reference key="NSTextColor" ref="1000275559"/> + </object> </object> </object> + <string key="NSFrame">{{0, 50}, {84, 53}}</string> + <reference key="NSSuperview" ref="1005"/> + <string key="NSClassName">GTMWidthBasedTweaker</string> </object> - <object class="NSComboBox" id="977232728"> + <object class="NSBox" id="899552678"> <reference key="NSNextResponder" ref="1005"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{87, 56}, {270, 26}}</string> - <reference key="NSSuperview" ref="1005"/> - <bool key="NSEnabled">YES</bool> - <object class="NSComboBoxCell" key="NSCell" id="1003570867"> - <int key="NSCellFlags">74579521</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="714614853"/> - <reference key="NSControlView" ref="977232728"/> - <bool key="NSDrawsBackground">YES</bool> - <reference key="NSBackgroundColor" ref="1033293763"/> - <reference key="NSTextColor" ref="1000275559"/> - <int key="NSVisibleItemCount">5</int> - <bool key="NSHasVerticalScroller">YES</bool> - <reference key="NSDelegate" ref="977232728"/> - <object class="NSComboTableView" key="NSTableView" id="1071628594"> - <reference key="NSNextResponder"/> - <int key="NSvFlags">274</int> - <string key="NSFrameSize">{15, 0}</string> - <reference key="NSSuperview"/> - <reference key="NSWindow"/> - <bool key="NSEnabled">YES</bool> - <object class="NSMutableArray" key="NSTableColumns"> + <int key="NSvFlags">10</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSView" id="583964310"> + <reference key="NSNextResponder" ref="899552678"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTableColumn"> - <integer value="0" key="NSIdentifier"/> - <double key="NSWidth">1.200000e+01</double> - <double key="NSMinWidth">1.000000e+01</double> - <double key="NSMaxWidth">1.000000e+03</double> - <object class="NSTableHeaderCell" key="NSHeaderCell"> - <int key="NSCellFlags">75628032</int> - <int key="NSCellFlags2">0</int> + <object class="NSTextField" id="39428350"> + <reference key="NSNextResponder" ref="583964310"/> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{8, 33}, {267, 19}}</string> + <reference key="NSSuperview" ref="583964310"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="905670292"> + <int key="NSCellFlags">-1804468671</int> + <int key="NSCellFlags2">272761856</int> <string key="NSContents"/> - <object class="NSFont" key="NSSupport"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.200000e+01</double> - <int key="NSfFlags">16</int> - </object> - <object class="NSColor" key="NSBackgroundColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes> - </object> - <reference key="NSTextColor" ref="660986653"/> - </object> - <object class="NSTextFieldCell" key="NSDataCell"> - <int key="NSCellFlags">338820672</int> - <int key="NSCellFlags2">1024</int> - <reference key="NSSupport" ref="714614853"/> - <reference key="NSControlView" ref="1071628594"/> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="39428350"/> <bool key="NSDrawsBackground">YES</bool> - <object class="NSColor" key="NSBackgroundColor" id="744868739"> + <object class="NSColor" key="NSBackgroundColor" id="1033293763"> <int key="NSColorSpace">6</int> <string key="NSCatalogName">System</string> - <string key="NSColorName">controlBackgroundColor</string> - <reference key="NSColor" ref="748407352"/> + <string key="NSColorName">textBackgroundColor</string> + <object class="NSColor" key="NSColor" id="660986653"> + <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> + <reference key="NSColor" ref="947148753"/> </object> - <reference key="NSTextColor" ref="1000275559"/> </object> - <int key="NSResizingMask">3</int> - <bool key="NSIsResizeable">YES</bool> - <reference key="NSTableView" ref="1071628594"/> </object> - </object> - <double key="NSIntercellSpacingWidth">3.000000e+00</double> - <double key="NSIntercellSpacingHeight">2.000000e+00</double> - <reference key="NSBackgroundColor" ref="744868739"/> - <object class="NSColor" key="NSGridColor"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">gridColor</string> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC41AA</bytes> + <object class="NSComboBox" id="977232728"> + <reference key="NSNextResponder" ref="583964310"/> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{8, 5}, {270, 22}}</string> + <reference key="NSSuperview" ref="583964310"/> + <bool key="NSEnabled">YES</bool> + <object class="NSComboBoxCell" key="NSCell" id="1003570867"> + <int key="NSCellFlags">74579521</int> + <int key="NSCellFlags2">272761856</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="977232728"/> + <bool key="NSDrawsBackground">YES</bool> + <reference key="NSBackgroundColor" ref="1033293763"/> + <reference key="NSTextColor" ref="1000275559"/> + <int key="NSVisibleItemCount">5</int> + <bool key="NSHasVerticalScroller">YES</bool> + <reference key="NSDelegate" ref="977232728"/> + <object class="NSComboTableView" key="NSTableView" id="1071628594"> + <reference key="NSNextResponder"/> + <int key="NSvFlags">274</int> + <string key="NSFrameSize">{15, 0}</string> + <reference key="NSSuperview"/> + <reference key="NSWindow"/> + <bool key="NSEnabled">YES</bool> + <object class="NSMutableArray" key="NSTableColumns"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTableColumn"> + <integer value="0" key="NSIdentifier"/> + <double key="NSWidth">1.200000e+01</double> + <double key="NSMinWidth">1.000000e+01</double> + <double key="NSMaxWidth">1.000000e+03</double> + <object class="NSTableHeaderCell" key="NSHeaderCell"> + <int key="NSCellFlags">75628032</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents"/> + <object class="NSFont" key="NSSupport"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">1.200000e+01</double> + <int key="NSfFlags">16</int> + </object> + <object class="NSColor" key="NSBackgroundColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes> + </object> + <reference key="NSTextColor" ref="660986653"/> + </object> + <object class="NSTextFieldCell" key="NSDataCell"> + <int key="NSCellFlags">338820672</int> + <int key="NSCellFlags2">1024</int> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="1071628594"/> + <bool key="NSDrawsBackground">YES</bool> + <object class="NSColor" key="NSBackgroundColor" id="744868739"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlBackgroundColor</string> + <reference key="NSColor" ref="748407352"/> + </object> + <reference key="NSTextColor" ref="1000275559"/> + </object> + <int key="NSResizingMask">3</int> + <bool key="NSIsResizeable">YES</bool> + <reference key="NSTableView" ref="1071628594"/> + </object> + </object> + <double key="NSIntercellSpacingWidth">3.000000e+00</double> + <double key="NSIntercellSpacingHeight">2.000000e+00</double> + <reference key="NSBackgroundColor" ref="744868739"/> + <object class="NSColor" key="NSGridColor"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">gridColor</string> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC41AA</bytes> + </object> + </object> + <double key="NSRowHeight">1.600000e+01</double> + <string key="NSAction">tableViewAction:</string> + <int key="NSTvFlags">-767524864</int> + <reference key="NSDelegate" ref="1003570867"/> + <reference key="NSDataSource" ref="1003570867"/> + <reference key="NSTarget" ref="1003570867"/> + <int key="NSColumnAutoresizingStyle">1</int> + <int key="NSDraggingSourceMaskForLocal">15</int> + <int key="NSDraggingSourceMaskForNonLocal">0</int> + <bool key="NSAllowsTypeSelect">YES</bool> + </object> + </object> </object> </object> - <double key="NSRowHeight">1.900000e+01</double> - <string key="NSAction">tableViewAction:</string> - <int key="NSTvFlags">-767524864</int> - <reference key="NSDelegate" ref="1003570867"/> - <reference key="NSDataSource" ref="1003570867"/> - <reference key="NSTarget" ref="1003570867"/> - <int key="NSColumnAutoresizingStyle">1</int> - <int key="NSDraggingSourceMaskForLocal">15</int> - <int key="NSDraggingSourceMaskForNonLocal">0</int> - <bool key="NSAllowsTypeSelect">YES</bool> + <string key="NSFrameSize">{294, 59}</string> + <reference key="NSSuperview" ref="899552678"/> </object> </object> - </object> - <object class="NSButton" id="430629007"> - <reference key="NSNextResponder" ref="1005"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{168, 12}, {96, 32}}</string> - <reference key="NSSuperview" ref="1005"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="562929863"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">^IDS_BOOMARK_BUBBLE_OPTIONS</string> - <reference key="NSSupport" ref="714614853"/> - <reference key="NSControlView" ref="430629007"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">129</int> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="82356437"> - <reference key="NSNextResponder" ref="1005"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{264, 12}, {96, 32}}</string> + <string key="NSFrame">{{79, 46}, {294, 59}}</string> <reference key="NSSuperview" ref="1005"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="307931553"> + <string key="NSOffsets">{0, 0}</string> + <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">^IDS_CLOSE</string> - <reference key="NSSupport" ref="714614853"/> - <reference key="NSControlView" ref="82356437"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">129</int> - <string key="NSAlternateContents"/> - <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="177936093"> - <reference key="NSNextResponder" ref="1005"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{14, 12}, {96, 32}}</string> - <reference key="NSSuperview" ref="1005"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="1066753170"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">^IDS_BOOMARK_BUBBLE_REMOVE_BOOKMARK</string> - <reference key="NSSupport" ref="714614853"/> - <reference key="NSControlView" ref="177936093"/> - <int key="NSButtonFlags">-2038021889</int> - <int key="NSButtonFlags2">129</int> - <object class="NSFont" key="NSAlternateImage"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.300000e+01</double> - <int key="NSfFlags">16</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="26"/> + <reference key="NSBackgroundColor" ref="1033293763"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes> </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> </object> + <reference key="NSContentView" ref="583964310"/> + <int key="NSBorderType">0</int> + <int key="NSBoxType">0</int> + <int key="NSTitlePosition">0</int> + <bool key="NSTransparent">NO</bool> </object> </object> - <string key="NSFrameSize">{374, 160}</string> + <string key="NSFrameSize">{374, 145}</string> <reference key="NSSuperview"/> <string key="NSClassName">BookmarkBubbleView</string> </object> <object class="NSCustomObject" id="704223344"> <string key="NSClassName">ChromeUILocalizer</string> </object> + <object class="NSCustomObject" id="279326944"> + <string key="NSClassName">GTMUILocalizerAndLayoutTweaker</string> + </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> <object class="NSMutableArray" key="connectionRecords"> @@ -367,27 +435,51 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">owner_</string> - <reference key="source" ref="704223344"/> - <reference key="destination" ref="1001"/> - </object> - <int key="connectionID">32</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">folderComboBox_</string> <reference key="source" ref="1001"/> <reference key="destination" ref="977232728"/> </object> <int key="connectionID">33</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">viewToResize_</string> + <reference key="source" ref="900754038"/> + <reference key="destination" ref="1005"/> + </object> + <int key="connectionID">40</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">viewToSlideAndResize_</string> + <reference key="source" ref="900754038"/> + <reference key="destination" ref="899552678"/> + </object> + <int key="connectionID">41</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">localizer_</string> + <reference key="source" ref="279326944"/> + <reference key="destination" ref="704223344"/> + </object> + <int key="connectionID">43</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">uiObject_</string> + <reference key="source" ref="279326944"/> + <reference key="destination" ref="1005"/> + </object> + <int key="connectionID">44</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="1002"> + <object class="NSArray" key="object" id="376579351"> <bool key="EncodedWithXMLCoder">YES</bool> </object> <reference key="children" ref="1000"/> @@ -396,19 +488,19 @@ <object class="IBObjectRecord"> <int key="objectID">-2</int> <reference key="object" ref="1001"/> - <reference key="parent" ref="1002"/> + <reference key="parent" ref="376579351"/> <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="1002"/> + <reference key="parent" ref="376579351"/> <string key="objectName">First Responder</string> </object> <object class="IBObjectRecord"> <int key="objectID">-3</int> <reference key="object" ref="1004"/> - <reference key="parent" ref="1002"/> + <reference key="parent" ref="376579351"/> <string key="objectName">Application</string> </object> <object class="IBObjectRecord"> @@ -416,16 +508,13 @@ <reference key="object" ref="1005"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="228609717"/> - <reference ref="39428350"/> - <reference ref="977232728"/> - <reference ref="82356437"/> - <reference ref="303910295"/> - <reference ref="430629007"/> - <reference ref="177936093"/> <reference ref="559397096"/> + <reference ref="46287572"/> + <reference ref="209382123"/> + <reference ref="900754038"/> + <reference ref="899552678"/> </object> - <reference key="parent" ref="1002"/> + <reference key="parent" ref="376579351"/> </object> <object class="IBObjectRecord"> <int key="objectID">2</int> @@ -442,107 +531,151 @@ <reference key="parent" ref="559397096"/> </object> <object class="IBObjectRecord"> - <int key="objectID">8</int> - <reference key="object" ref="303910295"/> + <int key="objectID">31</int> + <reference key="object" ref="704223344"/> + <reference key="parent" ref="376579351"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">34</int> + <reference key="object" ref="46287572"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="628112279"/> + <reference ref="82356437"/> + <reference ref="430629007"/> </object> <reference key="parent" ref="1005"/> </object> <object class="IBObjectRecord"> - <int key="objectID">9</int> - <reference key="object" ref="628112279"/> - <reference key="parent" ref="303910295"/> + <int key="objectID">18</int> + <reference key="object" ref="82356437"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="307931553"/> + </object> + <reference key="parent" ref="46287572"/> </object> <object class="IBObjectRecord"> - <int key="objectID">10</int> - <reference key="object" ref="228609717"/> + <int key="objectID">19</int> + <reference key="object" ref="307931553"/> + <reference key="parent" ref="82356437"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">16</int> + <reference key="object" ref="430629007"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="295393049"/> + <reference ref="562929863"/> </object> - <reference key="parent" ref="1005"/> + <reference key="parent" ref="46287572"/> </object> <object class="IBObjectRecord"> - <int key="objectID">11</int> - <reference key="object" ref="295393049"/> - <reference key="parent" ref="228609717"/> + <int key="objectID">17</int> + <reference key="object" ref="562929863"/> + <reference key="parent" ref="430629007"/> </object> <object class="IBObjectRecord"> - <int key="objectID">12</int> - <reference key="object" ref="39428350"/> + <int key="objectID">35</int> + <reference key="object" ref="209382123"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="905670292"/> + <reference ref="177936093"/> </object> <reference key="parent" ref="1005"/> </object> <object class="IBObjectRecord"> - <int key="objectID">13</int> - <reference key="object" ref="905670292"/> - <reference key="parent" ref="39428350"/> + <int key="objectID">20</int> + <reference key="object" ref="177936093"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1066753170"/> + </object> + <reference key="parent" ref="209382123"/> </object> <object class="IBObjectRecord"> - <int key="objectID">14</int> - <reference key="object" ref="977232728"/> + <int key="objectID">21</int> + <reference key="object" ref="1066753170"/> + <reference key="parent" ref="177936093"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">36</int> + <reference key="object" ref="900754038"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1003570867"/> + <reference ref="303910295"/> + <reference ref="228609717"/> </object> <reference key="parent" ref="1005"/> </object> <object class="IBObjectRecord"> - <int key="objectID">15</int> - <reference key="object" ref="1003570867"/> - <reference key="parent" ref="977232728"/> + <int key="objectID">8</int> + <reference key="object" ref="303910295"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="628112279"/> + </object> + <reference key="parent" ref="900754038"/> </object> <object class="IBObjectRecord"> - <int key="objectID">16</int> - <reference key="object" ref="430629007"/> + <int key="objectID">9</int> + <reference key="object" ref="628112279"/> + <reference key="parent" ref="303910295"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">10</int> + <reference key="object" ref="228609717"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="562929863"/> + <reference ref="295393049"/> </object> - <reference key="parent" ref="1005"/> + <reference key="parent" ref="900754038"/> </object> <object class="IBObjectRecord"> - <int key="objectID">17</int> - <reference key="object" ref="562929863"/> - <reference key="parent" ref="430629007"/> + <int key="objectID">11</int> + <reference key="object" ref="295393049"/> + <reference key="parent" ref="228609717"/> </object> <object class="IBObjectRecord"> - <int key="objectID">18</int> - <reference key="object" ref="82356437"/> + <int key="objectID">39</int> + <reference key="object" ref="899552678"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="307931553"/> + <reference ref="39428350"/> + <reference ref="977232728"/> </object> <reference key="parent" ref="1005"/> </object> <object class="IBObjectRecord"> - <int key="objectID">19</int> - <reference key="object" ref="307931553"/> - <reference key="parent" ref="82356437"/> + <int key="objectID">12</int> + <reference key="object" ref="39428350"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="905670292"/> + </object> + <reference key="parent" ref="899552678"/> </object> <object class="IBObjectRecord"> - <int key="objectID">20</int> - <reference key="object" ref="177936093"/> + <int key="objectID">13</int> + <reference key="object" ref="905670292"/> + <reference key="parent" ref="39428350"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">14</int> + <reference key="object" ref="977232728"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1066753170"/> + <reference ref="1003570867"/> </object> - <reference key="parent" ref="1005"/> + <reference key="parent" ref="899552678"/> </object> <object class="IBObjectRecord"> - <int key="objectID">21</int> - <reference key="object" ref="1066753170"/> - <reference key="parent" ref="177936093"/> + <int key="objectID">15</int> + <reference key="object" ref="1003570867"/> + <reference key="parent" ref="977232728"/> </object> <object class="IBObjectRecord"> - <int key="objectID">31</int> - <reference key="object" ref="704223344"/> - <reference key="parent" ref="1002"/> + <int key="objectID">42</int> + <reference key="object" ref="279326944"/> + <reference key="parent" ref="376579351"/> </object> </object> </object> @@ -555,6 +688,7 @@ <string>-3.IBPluginDependency</string> <string>1.IBEditorWindowLastContentRect</string> <string>1.IBPluginDependency</string> + <string>1.IBUserGuides</string> <string>1.WindowOrigin</string> <string>1.editorWindowContentRectSynchronizationRect</string> <string>10.IBPluginDependency</string> @@ -572,6 +706,7 @@ <string>21.IBPluginDependency</string> <string>3.IBPluginDependency</string> <string>31.IBPluginDependency</string> + <string>42.IBPluginDependency</string> <string>8.IBPluginDependency</string> <string>9.IBPluginDependency</string> </object> @@ -580,8 +715,16 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{725, 1184}, {374, 160}}</string> + <string>{{407, 412}, {374, 145}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSMutableArray"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBUserGuide"> + <reference key="view" ref="1005"/> + <float key="location">8.000000e+00</float> + <int key="affinity">3</int> + </object> + </object> <string>{628, 654}</string> <string>{{357, 416}, {480, 272}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -601,6 +744,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -623,7 +767,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">33</int> + <int key="maxID">44</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -708,6 +852,49 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">GTMUILocalizerAndLayoutTweaker</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>localizerOwner_</string> + <string>localizer_</string> + <string>uiObject_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>GTMUILocalizer</string> + <string>id</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1009161267"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">GTMWidthBasedTweaker</string> + <string key="superclassName">NSView</string> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" 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> + <string>id</string> + <string>NSView</string> + <string>NSView</string> + </object> + </object> + <reference key="sourceIdentifier" ref="1009161267"/> + </object> + <object class="IBPartialClassDescription"> <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> diff --git a/chrome/app/nibs/HungRendererDialog.xib b/chrome/app/nibs/HungRendererDialog.xib index 40f9a89..6aed9c3 100644 --- a/chrome/app/nibs/HungRendererDialog.xib +++ b/chrome/app/nibs/HungRendererDialog.xib @@ -2,13 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9J61</string> + <string key="IBDocument.SystemVersion">9L30</string> <string key="IBDocument.InterfaceBuilderVersion">677</string> - <string key="IBDocument.AppKitVersion">949.46</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" id="9"/> + <integer value="1"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -37,9 +37,9 @@ <object class="NSWindowTemplate" id="1005"> <int key="NSWindowStyleMask">1</int> <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{196, 264}, {480, 246}}</string> + <string key="NSWindowRect">{{196, 293}, {500, 217}}</string> <int key="NSWTFlags">536870912</int> - <string key="NSWindowTitle"/> + <string key="NSWindowTitle">^IDS_PRODUCT_NAME</string> <string key="NSWindowClass">NSWindow</string> <nil key="NSViewClass"/> <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> @@ -50,7 +50,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSScrollView" id="501203135"> <reference key="NSNextResponder" ref="1006"/> - <int key="NSvFlags">286</int> + <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSClipView" id="995011774"> @@ -61,7 +61,7 @@ <object class="NSTableView" id="216923421"> <reference key="NSNextResponder" ref="995011774"/> <int key="NSvFlags">256</int> - <string key="NSFrameSize">{350, 114}</string> + <string key="NSFrameSize">{350, 110}</string> <reference key="NSSuperview" ref="995011774"/> <bool key="NSEnabled">YES</bool> <object class="_NSCornerView" key="NSCornerView"> @@ -150,7 +150,7 @@ <bool key="NSAllowsTypeSelect">NO</bool> </object> </object> - <string key="NSFrame">{{1, 1}, {350, 114}}</string> + <string key="NSFrame">{{1, 1}, {350, 110}}</string> <reference key="NSSuperview" ref="501203135"/> <reference key="NSNextKeyView" ref="216923421"/> <reference key="NSDocView" ref="216923421"/> @@ -182,7 +182,7 @@ <double key="NSPercent">9.976415e-01</double> </object> </object> - <string key="NSFrame">{{108, 60}, {352, 116}}</string> + <string key="NSFrame">{{128, 60}, {352, 112}}</string> <reference key="NSSuperview" ref="1006"/> <reference key="NSNextKeyView" ref="995011774"/> <int key="NSsFlags">562</int> @@ -191,61 +191,21 @@ <reference key="NSContentView" ref="995011774"/> <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes> </object> - <object class="NSButton" id="485103160"> + <object class="NSTextField" id="777888236"> <reference key="NSNextResponder" ref="1006"/> - <int key="NSvFlags">289</int> - <string key="NSFrame">{{370, 12}, {96, 32}}</string> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{125, 180}, {358, 17}}</string> <reference key="NSSuperview" ref="1006"/> <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="147145924"> + <object class="NSTextFieldCell" key="NSCell" id="636497192"> <int key="NSCellFlags">-2080244224</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">Kill</string> + <int key="NSCellFlags2">272629760</int> + <string key="NSContents">^IDS_BROWSER_HANGMONITOR_RENDERER</string> <object class="NSFont" key="NSSupport" id="832152429"> <string key="NSName">LucidaGrande</string> <double key="NSSize">1.300000e+01</double> <int key="NSfFlags">1044</int> </object> - <reference key="NSControlView" ref="485103160"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">129</int> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="544568006"> - <reference key="NSNextResponder" ref="1006"/> - <int key="NSvFlags">289</int> - <string key="NSFrame">{{274, 12}, {96, 32}}</string> - <reference key="NSSuperview" ref="1006"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="602602853"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">Wait</string> - <reference key="NSSupport" ref="832152429"/> - <reference key="NSControlView" ref="544568006"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">129</int> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSTextField" id="777888236"> - <reference key="NSNextResponder" ref="1006"/> - <int key="NSvFlags">284</int> - <string key="NSFrame">{{105, 187}, {358, 39}}</string> - <reference key="NSSuperview" ref="1006"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="636497192"> - <int key="NSCellFlags">-2080244224</int> - <int key="NSCellFlags2">272629760</int> - <string key="NSContents">The following page(s) have become unresponsive. You can wait for them to become responsive or kill them.</string> - <reference key="NSSupport" ref="832152429"/> <reference key="NSControlView" ref="777888236"/> <object class="NSColor" key="NSBackgroundColor"> <int key="NSColorSpace">6</int> @@ -276,16 +236,12 @@ <string>NeXT TIFF v4.0 pasteboard type</string> </object> </object> - <string key="NSFrame">{{20, 146}, {80, 80}}</string> + <string key="NSFrame">{{20, 97}, {100, 100}}</string> <reference key="NSSuperview" ref="1006"/> <bool key="NSEnabled">YES</bool> <object class="NSImageCell" key="NSCell" id="281074803"> <int key="NSCellFlags">130560</int> <int key="NSCellFlags2">33554432</int> - <object class="NSCustomResource" key="NSContents"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">frozen_tab</string> - </object> <int key="NSAlign">0</int> <int key="NSScale">0</int> <int key="NSStyle">0</int> @@ -293,13 +249,69 @@ </object> <bool key="NSEditable">YES</bool> </object> + <object class="NSCustomView" id="218473211"> + <reference key="NSNextResponder" ref="1006"/> + <int key="NSvFlags">289</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="544568006"> + <reference key="NSNextResponder" ref="218473211"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{110, 12}, {96, 32}}</string> + <reference key="NSSuperview" ref="218473211"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="602602853"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">^IDS_BROWSER_HANGMONITOR_RENDERER_WAIT</string> + <reference key="NSSupport" ref="832152429"/> + <reference key="NSControlView" ref="544568006"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">129</int> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="485103160"> + <reference key="NSNextResponder" ref="218473211"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{14, 12}, {96, 32}}</string> + <reference key="NSSuperview" ref="218473211"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="147145924"> + <int key="NSCellFlags">-2080244224</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">^IDS_BROWSER_HANGMONITOR_RENDERER_END</string> + <reference key="NSSupport" ref="832152429"/> + <reference key="NSControlView" ref="485103160"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">129</int> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + </object> + <string key="NSFrame">{{280, 0}, {220, 52}}</string> + <reference key="NSSuperview" ref="1006"/> + <string key="NSClassName">GTMWidthBasedTweaker</string> + </object> </object> - <string key="NSFrameSize">{480, 246}</string> + <string key="NSFrameSize">{500, 217}</string> <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> </object> + <object class="NSCustomObject" id="264757785"> + <string key="NSClassName">ChromeUILocalizer</string> + </object> + <object class="NSCustomObject" id="654098324"> + <string key="NSClassName">GTMUILocalizerAndLayoutTweaker</string> + </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> <object class="NSMutableArray" key="connectionRecords"> @@ -376,6 +388,38 @@ </object> <int key="connectionID">26</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">imageView_</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="848955907"/> + </object> + <int key="connectionID">35</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">localizer_</string> + <reference key="source" ref="654098324"/> + <reference key="destination" ref="264757785"/> + </object> + <int key="connectionID">39</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">uiObject_</string> + <reference key="source" ref="654098324"/> + <reference key="destination" ref="1005"/> + </object> + <int key="connectionID">40</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">messageView_</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="777888236"/> + </object> + <int key="connectionID">41</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -420,11 +464,10 @@ <reference key="object" ref="1006"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="501203135"/> - <reference ref="485103160"/> - <reference ref="544568006"/> - <reference ref="777888236"/> <reference ref="848955907"/> + <reference ref="218473211"/> + <reference ref="777888236"/> + <reference ref="501203135"/> </object> <reference key="parent" ref="1005"/> </object> @@ -468,34 +511,6 @@ <reference key="parent" ref="216923421"/> </object> <object class="IBObjectRecord"> - <int key="objectID">12</int> - <reference key="object" ref="485103160"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="147145924"/> - </object> - <reference key="parent" ref="1006"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">13</int> - <reference key="object" ref="147145924"/> - <reference key="parent" ref="485103160"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">14</int> - <reference key="object" ref="544568006"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="602602853"/> - </object> - <reference key="parent" ref="1006"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">15</int> - <reference key="object" ref="602602853"/> - <reference key="parent" ref="544568006"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">23</int> <reference key="object" ref="354720928"/> <reference key="parent" ref="171324652"/> @@ -528,6 +543,54 @@ <reference key="object" ref="281074803"/> <reference key="parent" ref="848955907"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">36</int> + <reference key="object" ref="218473211"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="544568006"/> + <reference ref="485103160"/> + </object> + <reference key="parent" ref="1006"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">14</int> + <reference key="object" ref="544568006"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="602602853"/> + </object> + <reference key="parent" ref="218473211"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">15</int> + <reference key="object" ref="602602853"/> + <reference key="parent" ref="544568006"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">12</int> + <reference key="object" ref="485103160"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="147145924"/> + </object> + <reference key="parent" ref="218473211"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">13</int> + <reference key="object" ref="147145924"/> + <reference key="parent" ref="485103160"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">37</int> + <reference key="object" ref="264757785"/> + <reference key="parent" ref="1002"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">38</int> + <reference key="object" ref="654098324"/> + <reference key="parent" ref="1002"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -554,6 +617,8 @@ <string>32.IBPluginDependency</string> <string>33.IBPluginDependency</string> <string>34.IBPluginDependency</string> + <string>37.IBPluginDependency</string> + <string>38.IBPluginDependency</string> <string>4.IBPluginDependency</string> <string>5.IBPluginDependency</string> <string>6.IBPluginDependency</string> @@ -564,10 +629,10 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{441, 138}, {480, 246}}</string> + <string>{{441, 167}, {500, 217}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{441, 138}, {480, 246}}</string> - <reference ref="9"/> + <string>{{441, 167}, {500, 217}}</string> + <boolean value="NO"/> <string>{196, 240}</string> <string>{{357, 418}, {480, 270}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -585,6 +650,8 @@ <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> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -607,12 +674,86 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">34</int> + <int key="maxID">41</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> <bool key="EncodedWithXMLCoder">YES</bool> <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">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">GTMUILocalizerAndLayoutTweaker</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>localizerOwner_</string> + <string>localizer_</string> + <string>uiObject_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>GTMUILocalizer</string> + <string>id</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="525261727"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">GTMWidthBasedTweaker</string> + <string key="superclassName">NSView</string> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" 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> + <string>id</string> + <string>NSView</string> + <string>NSView</string> + </object> + </object> + <reference key="sourceIdentifier" ref="525261727"/> + </object> + <object class="IBPartialClassDescription"> <string key="className">HungRendererController</string> <string key="superclassName">NSWindowController</string> <object class="NSMutableDictionary" key="actions"> @@ -632,13 +773,17 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>imageView_</string> <string>killButton_</string> + <string>messageView_</string> <string>tableView_</string> <string>waitButton_</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSImageView</string> <string>NSButton</string> + <string>NSTextField</string> <string>NSTableView</string> <string>NSButton</string> </object> @@ -652,13 +797,20 @@ <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> </object> <int key="IBDocument.localizationMode">0</int> - <string key="IBDocument.LastKnownRelativeProjectPath">../../../chrome.xcodeproj</string> + <string key="IBDocument.LastKnownRelativeProjectPath">../../chrome.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> </data> </archive> diff --git a/chrome/browser/cocoa/hung_renderer_controller.h b/chrome/browser/cocoa/hung_renderer_controller.h index 9139503b..caf61b2 100644 --- a/chrome/browser/cocoa/hung_renderer_controller.h +++ b/chrome/browser/cocoa/hung_renderer_controller.h @@ -26,6 +26,8 @@ IBOutlet NSButton* waitButton_; IBOutlet NSButton* killButton_; IBOutlet NSTableView* tableView_; + IBOutlet NSImageView* imageView_; + IBOutlet NSTextField* messageView_; // The TabContents for which this dialog is open. Should never be // NULL while this dialog is open. diff --git a/chrome/browser/cocoa/hung_renderer_controller.mm b/chrome/browser/cocoa/hung_renderer_controller.mm index 0303f29..e401e8b 100644 --- a/chrome/browser/cocoa/hung_renderer_controller.mm +++ b/chrome/browser/cocoa/hung_renderer_controller.mm @@ -4,11 +4,11 @@ #import <Cocoa/Cocoa.h> -#include "app/l10n_util.h" +#include "app/resource_bundle.h" +#include "app/l10n_util_mac.h" #include "base/mac_util.h" #include "base/process_util.h" #include "base/sys_string_conversions.h" -#include "grit/generated_resources.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/hung_renderer_dialog.h" #import "chrome/browser/cocoa/hung_renderer_controller.h" @@ -16,6 +16,8 @@ #include "chrome/common/logging_chrome.h" #include "chrome/common/result_codes.h" #include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" namespace { // We only support showing one of these at a time per app. The @@ -41,10 +43,28 @@ HungRendererController* g_instance = NULL; } - (void)awakeFromNib { - // This is easier than creating a localizer, since we only have one - // string to modify. - std::wstring productString = l10n_util::GetString(IDS_PRODUCT_NAME); - [[self window] setTitle:base::SysWideToNSString(productString)]; + // Load in the image + ResourceBundle& rb = ResourceBundle::GetSharedInstance(); + NSImage* backgroundImage = rb.GetNSImageNamed(IDR_FROZEN_TAB_ICON); + DCHECK(backgroundImage); + [imageView_ setImage:backgroundImage]; + + // Make the message fit. + CGFloat messageShift = + [GTMUILocalizerAndLayoutTweaker sizeToFitFixedWidthTextField:messageView_]; + + // Move the graphic up to be top even with the message. + NSRect graphicFrame = [imageView_ frame]; + graphicFrame.origin.y += messageShift; + [imageView_ setFrame:graphicFrame]; + + // Make the window taller to fit everything. + NSWindow* window = [self window]; + [[window contentView] setAutoresizesSubviews:NO]; + NSRect windowFrame = [window frame]; + windowFrame.size.height += messageShift; + [window setFrame:windowFrame display:NO]; + [[window contentView] setAutoresizesSubviews:YES]; } - (IBAction)kill:(id)sender { @@ -72,9 +92,9 @@ HungRendererController* g_instance = NULL; // TODO(rohitrao): Add favicons. TabContents* contents = hungRenderers_[rowIndex]; string16 title = contents->GetTitle(); - if (title.empty()) - title = l10n_util::GetStringUTF16(IDS_TAB_UNTITLED_TITLE); - return base::SysUTF16ToNSString(title); + if (!title.empty()) + return base::SysUTF16ToNSString(title); + return l10n_util::GetNSStringWithFixup(IDS_TAB_UNTITLED_TITLE); } - (void)windowWillClose:(NSNotification*)notification { diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index fe1dcbc..51074de 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -2269,11 +2269,11 @@ 'app/nibs/BookmarkEditor.xib', 'app/nibs/BookmarkNameFolder.xib', 'app/nibs/ClearBrowsingData.xib', + 'app/nibs/HungRendererDialog.xib', 'app/nibs/MainMenu.xib', 'app/nibs/SaveAccessoryView.xib', 'app/nibs/TabView.xib', 'app/nibs/Toolbar.xib', - # TODO(tvl): add other xibs as needed ], }, 'action_name': 'Process xibs for localization', @@ -3004,7 +3004,6 @@ 'app/theme/close_bar_p.pdf', 'app/theme/downloads_favicon.png', 'app/theme/forward_Template.pdf', - 'app/theme/frozen_tab.png', 'app/theme/go_Template.pdf', 'app/theme/home_Template.pdf', 'app/theme/menu_chrome_rtl_Template.pdf', |