From 65ce7b7c05b1ce8bb1ca0c6c460c5a79d726356a Mon Sep 17 00:00:00 2001
From: "bauerb@chromium.org"
 <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 30 Apr 2010 08:45:58 +0000
Subject: Revert 46049 - [Mac] Make exceptions dialog a sheet.

XIB changes (applying to ContentExceptionsWindow.xib and GeolocationExceptionsWindow.xib):
The window is now drawn in Aqua style, with window margins, Aqua buttons and text labels for them.

At the bottom right of the window there is an additional button for closing the sheet, hooked up to the |doneButton_| outlet in the file's owner and with action |closeSheet:|.

The lefthand side buttons are inside a |GTMWidthBasedTweaker|, as is the done button. The actual tweaking is done by a newly added |GTMUILocalizerAndLayoutTweaker|.

BUG=38021
TEST=Preferences > Under the Hood > Content Settings > Exceptions should be a sheet.

Review URL: http://codereview.chromium.org/1760001

TBR=bauerb@chromium.org
Review URL: http://codereview.chromium.org/1790009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46050 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/app/nibs/ContentExceptionsWindow.xib        | 490 +++++++--------------
 chrome/app/nibs/GeolocationExceptionsWindow.xib    | 303 +++----------
 .../cocoa/content_exceptions_window_controller.h   |  15 +-
 .../cocoa/content_exceptions_window_controller.mm  |  49 +--
 .../cocoa/content_settings_dialog_controller.h     |   3 -
 .../cocoa/content_settings_dialog_controller.mm    |  16 +-
 .../geolocation_exceptions_window_controller.h     |   9 +-
 .../geolocation_exceptions_window_controller.mm    |  48 +-
 8 files changed, 258 insertions(+), 675 deletions(-)

diff --git a/chrome/app/nibs/ContentExceptionsWindow.xib b/chrome/app/nibs/ContentExceptionsWindow.xib
index 9e2b30f..1ccb4c4 100644
--- a/chrome/app/nibs/ContentExceptionsWindow.xib
+++ b/chrome/app/nibs/ContentExceptionsWindow.xib
@@ -37,13 +37,13 @@
 			<object class="NSWindowTemplate" id="1005">
 				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{477, 138}, {533, 448}}</string>
+				<string key="NSWindowRect">{{477, 301}, {480, 285}}</string>
 				<int key="NSWTFlags">536870912</int>
 				<string key="NSWindowTitle">Title set by controller</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
-				<string key="NSWindowContentMinSize">{425, 131}</string>
+				<string key="NSWindowContentMinSize">{200, 100}</string>
 				<object class="NSView" key="NSWindowView" id="1006">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
@@ -62,13 +62,13 @@
 										<object class="NSTableView" id="178750169">
 											<reference key="NSNextResponder" ref="854753160"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrameSize">{491, 351}</string>
+											<string key="NSFrameSize">{480, 233}</string>
 											<reference key="NSSuperview" ref="854753160"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="1052514209">
 												<reference key="NSNextResponder" ref="522115304"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrameSize">{491, 17}</string>
+												<string key="NSFrameSize">{480, 17}</string>
 												<reference key="NSSuperview" ref="522115304"/>
 												<reference key="NSTableView" ref="178750169"/>
 											</object>
@@ -82,7 +82,7 @@
 												<bool key="EncodedWithXMLCoder">YES</bool>
 												<object class="NSTableColumn" id="20203331">
 													<string key="NSIdentifier">pattern</string>
-													<double key="NSWidth">3.120000e+02</double>
+													<double key="NSWidth">3.020000e+02</double>
 													<double key="NSMinWidth">4.000000e+01</double>
 													<double key="NSMaxWidth">1.000000e+03</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -141,7 +141,7 @@
 												</object>
 												<object class="NSTableColumn" id="332085935">
 													<string key="NSIdentifier">action</string>
-													<double key="NSWidth">1.730000e+02</double>
+													<double key="NSWidth">1.720000e+02</double>
 													<double key="NSMinWidth">4.000000e+01</double>
 													<double key="NSMaxWidth">1.000000e+03</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -223,7 +223,7 @@
 											<bool key="NSAllowsTypeSelect">YES</bool>
 										</object>
 									</object>
-									<string key="NSFrame">{{1, 17}, {491, 351}}</string>
+									<string key="NSFrame">{{1, 17}, {480, 233}}</string>
 									<reference key="NSSuperview" ref="832680793"/>
 									<reference key="NSNextKeyView" ref="178750169"/>
 									<reference key="NSDocView" ref="178750169"/>
@@ -233,21 +233,22 @@
 								<object class="NSScroller" id="984908608">
 									<reference key="NSNextResponder" ref="832680793"/>
 									<int key="NSvFlags">-2147483392</int>
-									<string key="NSFrame">{{368, 17}, {15, 327}}</string>
+									<string key="NSFrame">{{466, 17}, {15, 218}}</string>
 									<reference key="NSSuperview" ref="832680793"/>
 									<reference key="NSTarget" ref="832680793"/>
 									<string key="NSAction">_doScroller:</string>
-									<double key="NSPercent">9.941860e-01</double>
+									<double key="NSCurValue">1.000000e+00</double>
+									<double key="NSPercent">9.356223e-01</double>
 								</object>
 								<object class="NSScroller" id="689783017">
 									<reference key="NSNextResponder" ref="832680793"/>
 									<int key="NSvFlags">-2147483392</int>
-									<string key="NSFrame">{{1, 344}, {367, 15}}</string>
+									<string key="NSFrame">{{1, 235}, {465, 15}}</string>
 									<reference key="NSSuperview" ref="832680793"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="832680793"/>
 									<string key="NSAction">_doScroller:</string>
-									<double key="NSPercent">9.973890e-01</double>
+									<double key="NSPercent">9.979210e-01</double>
 								</object>
 								<object class="NSClipView" id="522115304">
 									<reference key="NSNextResponder" ref="832680793"/>
@@ -256,7 +257,7 @@
 										<bool key="EncodedWithXMLCoder">YES</bool>
 										<reference ref="1052514209"/>
 									</object>
-									<string key="NSFrame">{{1, 0}, {491, 17}}</string>
+									<string key="NSFrame">{{1, 0}, {480, 17}}</string>
 									<reference key="NSSuperview" ref="832680793"/>
 									<reference key="NSNextKeyView" ref="1052514209"/>
 									<reference key="NSDocView" ref="1052514209"/>
@@ -265,7 +266,7 @@
 								</object>
 								<reference ref="274818157"/>
 							</object>
-							<string key="NSFrame">{{20, 59}, {493, 369}}</string>
+							<string key="NSFrame">{{-1, 35}, {482, 251}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSNextKeyView" ref="854753160"/>
 							<int key="NSsFlags">562</int>
@@ -276,124 +277,85 @@
 							<reference key="NSCornerView" ref="274818157"/>
 							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
 						</object>
-						<object class="NSCustomView" id="864465341">
+						<object class="NSButton" id="232729973">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">292</int>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSButton" id="947861542">
-									<reference key="NSNextResponder" ref="864465341"/>
-									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{14, 12}, {79, 32}}</string>
-									<reference key="NSSuperview" ref="864465341"/>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSButtonCell" key="NSCell" id="557322662">
-										<int key="NSCellFlags">67239424</int>
-										<int key="NSCellFlags2">134217728</int>
-										<string key="NSContents">^IDS_EXCEPTIONS_ADD_BUTTON</string>
-										<reference key="NSSupport" ref="22228631"/>
-										<reference key="NSControlView" ref="947861542"/>
-										<int key="NSButtonFlags">-2038021889</int>
-										<int key="NSButtonFlags2">129</int>
-										<reference key="NSAlternateImage" ref="22228631"/>
-										<string key="NSAlternateContents"/>
-										<string key="NSKeyEquivalent"/>
-										<int key="NSPeriodicDelay">400</int>
-										<int key="NSPeriodicInterval">75</int>
-									</object>
-								</object>
-								<object class="NSButton" id="392278592">
-									<reference key="NSNextResponder" ref="864465341"/>
-									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{93, 12}, {90, 32}}</string>
-									<reference key="NSSuperview" ref="864465341"/>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSButtonCell" key="NSCell" id="1025786806">
-										<int key="NSCellFlags">-2080244224</int>
-										<int key="NSCellFlags2">134217728</int>
-										<string key="NSContents">^IDS_EXCEPTIONS_REMOVE_BUTTON</string>
-										<reference key="NSSupport" ref="22228631"/>
-										<reference key="NSControlView" ref="392278592"/>
-										<int key="NSButtonFlags">-2038021889</int>
-										<int key="NSButtonFlags2">129</int>
-										<reference key="NSAlternateImage" ref="22228631"/>
-										<string key="NSAlternateContents"/>
-										<string key="NSKeyEquivalent"/>
-										<int key="NSPeriodicDelay">400</int>
-										<int key="NSPeriodicInterval">75</int>
-									</object>
-								</object>
-								<object class="NSButton" id="189525473">
-									<reference key="NSNextResponder" ref="864465341"/>
-									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{183, 12}, {124, 32}}</string>
-									<reference key="NSSuperview" ref="864465341"/>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSButtonCell" key="NSCell" id="1002841272">
-										<int key="NSCellFlags">-2080244224</int>
-										<int key="NSCellFlags2">134217728</int>
-										<string key="NSContents">^IDS_EXCEPTIONS_REMOVEALL_BUTTON</string>
-										<reference key="NSSupport" ref="22228631"/>
-										<reference key="NSControlView" ref="189525473"/>
-										<int key="NSButtonFlags">-2038021889</int>
-										<int key="NSButtonFlags2">129</int>
-										<reference key="NSAlternateImage" ref="22228631"/>
-										<string key="NSAlternateContents"/>
-										<string key="NSKeyEquivalent"/>
-										<int key="NSPeriodicDelay">400</int>
-										<int key="NSPeriodicInterval">75</int>
-									</object>
+							<string key="NSFrame">{{7, 5}, {25, 25}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="723955339">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents"/>
+								<reference key="NSSupport" ref="22228631"/>
+								<reference key="NSControlView" ref="232729973"/>
+								<int key="NSButtonFlags">-2033958657</int>
+								<int key="NSButtonFlags2">163</int>
+								<object class="NSCustomResource" key="NSNormalImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">NSAddTemplate</string>
 								</object>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
 							</object>
-							<string key="NSFrameSize">{307, 51}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<string key="NSClassName">GTMWidthBasedTweaker</string>
 						</object>
-						<object class="NSCustomView" id="2487133">
+						<object class="NSButton" id="297568762">
 							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">289</int>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSButton" id="899975008">
-									<reference key="NSNextResponder" ref="2487133"/>
-									<int key="NSvFlags">289</int>
-									<string key="NSFrame">{{0, 12}, {73, 32}}</string>
-									<reference key="NSSuperview" ref="2487133"/>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSButtonCell" key="NSCell" id="284149949">
-										<int key="NSCellFlags">-2080244224</int>
-										<int key="NSCellFlags2">134217728</int>
-										<string key="NSContents">^IDS_DONE</string>
-										<reference key="NSSupport" ref="22228631"/>
-										<reference key="NSControlView" ref="899975008"/>
-										<int key="NSButtonFlags">-2038021889</int>
-										<int key="NSButtonFlags2">129</int>
-										<reference key="NSAlternateImage" ref="22228631"/>
-										<string key="NSAlternateContents"/>
-										<string key="NSKeyEquivalent"/>
-										<int key="NSPeriodicDelay">400</int>
-										<int key="NSPeriodicInterval">75</int>
-									</object>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{40, 5}, {25, 25}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="655968889">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents"/>
+								<reference key="NSSupport" ref="22228631"/>
+								<reference key="NSControlView" ref="297568762"/>
+								<int key="NSButtonFlags">-2033958657</int>
+								<int key="NSButtonFlags2">163</int>
+								<object class="NSCustomResource" key="NSNormalImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">NSRemoveTemplate</string>
 								</object>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
 							</object>
-							<string key="NSFrame">{{446, 0}, {87, 51}}</string>
+						</object>
+						<object class="NSButton" id="882966747">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{73, 5}, {96, 25}}</string>
 							<reference key="NSSuperview" ref="1006"/>
-							<string key="NSClassName">GTMWidthBasedTweaker</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="1032008525">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">^IDS_EXCEPTIONS_PAGE_VIEW_REMOVE_ALL_BUTTON</string>
+								<reference key="NSSupport" ref="22228631"/>
+								<reference key="NSControlView" ref="882966747"/>
+								<int key="NSButtonFlags">-2038152961</int>
+								<int key="NSButtonFlags2">163</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
+							</object>
 						</object>
 					</object>
-					<string key="NSFrameSize">{533, 448}</string>
+					<string key="NSFrameSize">{480, 285}</string>
 					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
-				<string key="NSMinSize">{425, 153}</string>
+				<string key="NSMinSize">{200, 122}</string>
 				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 			</object>
 			<object class="NSCustomObject" id="792052397">
 				<string key="NSClassName">ChromeUILocalizer</string>
 			</object>
-			<object class="NSCustomObject" id="985169067">
-				<string key="NSClassName">GTMUILocalizerAndLayoutTweaker</string>
-			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<object class="NSMutableArray" key="connectionRecords">
@@ -424,6 +386,30 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
+						<string key="label">addButton_</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="232729973"/>
+					</object>
+					<int key="connectionID">22</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">removeButton_</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="297568762"/>
+					</object>
+					<int key="connectionID">23</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">removeAllButton_</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="882966747"/>
+					</object>
+					<int key="connectionID">24</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
 						<string key="label">tableView_</string>
 						<reference key="source" ref="1001"/>
 						<reference key="destination" ref="178750169"/>
@@ -448,91 +434,27 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">closeSheet:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="899975008"/>
-					</object>
-					<int key="connectionID">55</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">removeAllExceptions:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="189525473"/>
-					</object>
-					<int key="connectionID">56</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
 						<string key="label">addException:</string>
 						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="947861542"/>
+						<reference key="destination" ref="232729973"/>
 					</object>
-					<int key="connectionID">57</int>
+					<int key="connectionID">28</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">removeException:</string>
 						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="392278592"/>
-					</object>
-					<int key="connectionID">58</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">addButton_</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="947861542"/>
-					</object>
-					<int key="connectionID">59</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">removeButton_</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="392278592"/>
-					</object>
-					<int key="connectionID">61</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">removeAllButton_</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="189525473"/>
+						<reference key="destination" ref="297568762"/>
 					</object>
-					<int key="connectionID">62</int>
+					<int key="connectionID">29</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">initialFirstResponder</string>
-						<reference key="source" ref="1005"/>
-						<reference key="destination" ref="899975008"/>
-					</object>
-					<int key="connectionID">63</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">localizer_</string>
-						<reference key="source" ref="985169067"/>
-						<reference key="destination" ref="792052397"/>
-					</object>
-					<int key="connectionID">65</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">uiObject_</string>
-						<reference key="source" ref="985169067"/>
-						<reference key="destination" ref="1005"/>
-					</object>
-					<int key="connectionID">66</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">doneButton_</string>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">removeAllExceptions:</string>
 						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="899975008"/>
+						<reference key="destination" ref="882966747"/>
 					</object>
-					<int key="connectionID">67</int>
+					<int key="connectionID">30</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -579,8 +501,9 @@
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="832680793"/>
-							<reference ref="864465341"/>
-							<reference ref="2487133"/>
+							<reference ref="232729973"/>
+							<reference ref="297568762"/>
+							<reference ref="882966747"/>
 						</object>
 						<reference key="parent" ref="1005"/>
 					</object>
@@ -645,113 +568,74 @@
 						<reference key="parent" ref="20203331"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">20</int>
-						<reference key="object" ref="792052397"/>
-						<reference key="parent" ref="13599172"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">31</int>
-						<reference key="object" ref="515496406"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1034662954"/>
-						</object>
-						<reference key="parent" ref="332085935"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">32</int>
-						<reference key="object" ref="1034662954"/>
+						<int key="objectID">14</int>
+						<reference key="object" ref="232729973"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="954294582"/>
+							<reference ref="723955339"/>
 						</object>
-						<reference key="parent" ref="515496406"/>
+						<reference key="parent" ref="1006"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">33</int>
-						<reference key="object" ref="954294582"/>
-						<reference key="parent" ref="1034662954"/>
+						<int key="objectID">15</int>
+						<reference key="object" ref="723955339"/>
+						<reference key="parent" ref="232729973"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">39</int>
-						<reference key="object" ref="864465341"/>
+						<int key="objectID">16</int>
+						<reference key="object" ref="297568762"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="947861542"/>
-							<reference ref="392278592"/>
-							<reference ref="189525473"/>
+							<reference ref="655968889"/>
 						</object>
 						<reference key="parent" ref="1006"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">44</int>
-						<reference key="object" ref="947861542"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="557322662"/>
-						</object>
-						<reference key="parent" ref="864465341"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">45</int>
-						<reference key="object" ref="392278592"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1025786806"/>
-						</object>
-						<reference key="parent" ref="864465341"/>
+						<int key="objectID">17</int>
+						<reference key="object" ref="655968889"/>
+						<reference key="parent" ref="297568762"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">46</int>
-						<reference key="object" ref="189525473"/>
+						<int key="objectID">18</int>
+						<reference key="object" ref="882966747"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1002841272"/>
+							<reference ref="1032008525"/>
 						</object>
-						<reference key="parent" ref="864465341"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">47</int>
-						<reference key="object" ref="1002841272"/>
-						<reference key="parent" ref="189525473"/>
+						<reference key="parent" ref="1006"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">48</int>
-						<reference key="object" ref="1025786806"/>
-						<reference key="parent" ref="392278592"/>
+						<int key="objectID">19</int>
+						<reference key="object" ref="1032008525"/>
+						<reference key="parent" ref="882966747"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">49</int>
-						<reference key="object" ref="557322662"/>
-						<reference key="parent" ref="947861542"/>
+						<int key="objectID">20</int>
+						<reference key="object" ref="792052397"/>
+						<reference key="parent" ref="13599172"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">50</int>
-						<reference key="object" ref="2487133"/>
+						<int key="objectID">31</int>
+						<reference key="object" ref="515496406"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="899975008"/>
+							<reference ref="1034662954"/>
 						</object>
-						<reference key="parent" ref="1006"/>
+						<reference key="parent" ref="332085935"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">53</int>
-						<reference key="object" ref="899975008"/>
+						<int key="objectID">32</int>
+						<reference key="object" ref="1034662954"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="284149949"/>
+							<reference ref="954294582"/>
 						</object>
-						<reference key="parent" ref="2487133"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">54</int>
-						<reference key="object" ref="284149949"/>
-						<reference key="parent" ref="899975008"/>
+						<reference key="parent" ref="515496406"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">64</int>
-						<reference key="object" ref="985169067"/>
-						<reference key="parent" ref="13599172"/>
+						<int key="objectID">33</int>
+						<reference key="object" ref="954294582"/>
+						<reference key="parent" ref="1034662954"/>
 					</object>
 				</object>
 			</object>
@@ -764,7 +648,6 @@
 					<string>-3.IBPluginDependency</string>
 					<string>1.IBEditorWindowLastContentRect</string>
 					<string>1.IBPluginDependency</string>
-					<string>1.IBViewEditorWindowController.showingLayoutRectangles</string>
 					<string>1.IBWindowTemplateEditedContentRect</string>
 					<string>1.NSWindowTemplate.visibleAtLaunch</string>
 					<string>1.WindowOrigin</string>
@@ -774,23 +657,20 @@
 					<string>10.IBPluginDependency</string>
 					<string>11.IBPluginDependency</string>
 					<string>13.IBPluginDependency</string>
+					<string>14.IBPluginDependency</string>
+					<string>15.IBPluginDependency</string>
+					<string>16.IBPluginDependency</string>
+					<string>17.IBPluginDependency</string>
+					<string>18.IBPluginDependency</string>
+					<string>19.IBPluginDependency</string>
 					<string>2.IBPluginDependency</string>
 					<string>20.IBPluginDependency</string>
 					<string>31.IBPluginDependency</string>
 					<string>32.IBEditorWindowLastContentRect</string>
 					<string>32.IBPluginDependency</string>
 					<string>33.IBPluginDependency</string>
-					<string>44.IBPluginDependency</string>
-					<string>45.IBPluginDependency</string>
-					<string>46.IBPluginDependency</string>
-					<string>47.IBPluginDependency</string>
-					<string>48.IBPluginDependency</string>
-					<string>49.IBPluginDependency</string>
 					<string>5.IBPluginDependency</string>
-					<string>53.IBPluginDependency</string>
-					<string>54.IBPluginDependency</string>
 					<string>6.IBPluginDependency</string>
-					<string>64.IBPluginDependency</string>
 					<string>7.IBPluginDependency</string>
 					<string>8.IBPluginDependency</string>
 					<string>9.IBPluginDependency</string>
@@ -800,24 +680,19 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{507, 468}, {533, 448}}</string>
+					<string>{{128, 406}, {480, 285}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<boolean value="YES" id="5"/>
-					<string>{{507, 468}, {533, 448}}</string>
-					<boolean value="NO"/>
+					<string>{{128, 406}, {480, 285}}</string>
+					<integer value="1"/>
 					<string>{196, 240}</string>
 					<string>{{357, 418}, {480, 270}}</string>
-					<reference ref="5"/>
-					<string>{425, 131}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<boolean value="YES"/>
+					<string>{200, 100}</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>{{13, 491}, {480, 20}}</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>
@@ -825,6 +700,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{13, 491}, {480, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -854,7 +730,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">67</int>
+			<int key="maxID">33</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -876,7 +752,6 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addException:</string>
 							<string>cancel:</string>
-							<string>closeSheet:</string>
 							<string>removeAllExceptions:</string>
 							<string>removeException:</string>
 						</object>
@@ -886,7 +761,6 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -894,7 +768,6 @@
 						<object class="NSMutableArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addButton_</string>
-							<string>doneButton_</string>
 							<string>removeAllButton_</string>
 							<string>removeButton_</string>
 							<string>tableView_</string>
@@ -904,7 +777,6 @@
 							<string>NSButton</string>
 							<string>NSButton</string>
 							<string>NSButton</string>
-							<string>NSButton</string>
 							<string>NSTableView</string>
 						</object>
 					</object>
@@ -937,49 +809,6 @@
 					</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="242892745">
-						<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="242892745"/>
-				</object>
-				<object class="IBPartialClassDescription">
 					<string key="className">NSMenuItem</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
@@ -990,13 +819,6 @@
 					<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/status_bubble_mac.h</string>
 					</object>
 				</object>
diff --git a/chrome/app/nibs/GeolocationExceptionsWindow.xib b/chrome/app/nibs/GeolocationExceptionsWindow.xib
index f3c57aa..ed6cea4 100644
--- a/chrome/app/nibs/GeolocationExceptionsWindow.xib
+++ b/chrome/app/nibs/GeolocationExceptionsWindow.xib
@@ -3,12 +3,12 @@
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
 		<string key="IBDocument.SystemVersion">9L31a</string>
-		<string key="IBDocument.InterfaceBuilderVersion">680</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="2"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -37,7 +37,7 @@
 			<object class="NSWindowTemplate" id="1005">
 				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{477, 202}, {474, 384}}</string>
+				<string key="NSWindowRect">{{477, 301}, {480, 285}}</string>
 				<int key="NSWTFlags">536870912</int>
 				<string key="NSWindowTitle">^IDS_GEOLOCATION_EXCEPTION_TITLE</string>
 				<string key="NSWindowClass">NSWindow</string>
@@ -62,13 +62,13 @@
 										<object class="NSTableView" id="178750169">
 											<reference key="NSNextResponder" ref="854753160"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrameSize">{432, 287}</string>
+											<string key="NSFrameSize">{480, 233}</string>
 											<reference key="NSSuperview" ref="854753160"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="1052514209">
 												<reference key="NSNextResponder" ref="522115304"/>
 												<int key="NSvFlags">256</int>
-												<string key="NSFrameSize">{432, 17}</string>
+												<string key="NSFrameSize">{480, 17}</string>
 												<reference key="NSSuperview" ref="522115304"/>
 												<reference key="NSTableView" ref="178750169"/>
 											</object>
@@ -82,7 +82,7 @@
 												<bool key="EncodedWithXMLCoder">YES</bool>
 												<object class="NSTableColumn" id="20203331">
 													<string key="NSIdentifier">hostname</string>
-													<double key="NSWidth">2.750000e+02</double>
+													<double key="NSWidth">3.020000e+02</double>
 													<double key="NSMinWidth">4.000000e+01</double>
 													<double key="NSMaxWidth">1.000000e+03</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -141,7 +141,7 @@
 												</object>
 												<object class="NSTableColumn" id="332085935">
 													<string key="NSIdentifier">action</string>
-													<double key="NSWidth">1.510000e+02</double>
+													<double key="NSWidth">1.720000e+02</double>
 													<double key="NSMinWidth">4.000000e+01</double>
 													<double key="NSMaxWidth">1.000000e+03</double>
 													<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -195,7 +195,7 @@
 											<bool key="NSAllowsTypeSelect">YES</bool>
 										</object>
 									</object>
-									<string key="NSFrame">{{1, 17}, {432, 287}}</string>
+									<string key="NSFrame">{{1, 17}, {480, 233}}</string>
 									<reference key="NSSuperview" ref="832680793"/>
 									<reference key="NSNextKeyView" ref="178750169"/>
 									<reference key="NSDocView" ref="178750169"/>
@@ -205,21 +205,22 @@
 								<object class="NSScroller" id="984908608">
 									<reference key="NSNextResponder" ref="832680793"/>
 									<int key="NSvFlags">-2147483392</int>
-									<string key="NSFrame">{{509, 17}, {15, 270}}</string>
+									<string key="NSFrame">{{466, 17}, {15, 218}}</string>
 									<reference key="NSSuperview" ref="832680793"/>
 									<reference key="NSTarget" ref="832680793"/>
 									<string key="NSAction">_doScroller:</string>
+									<double key="NSCurValue">1.000000e+00</double>
 									<double key="NSPercent">9.356223e-01</double>
 								</object>
 								<object class="NSScroller" id="689783017">
 									<reference key="NSNextResponder" ref="832680793"/>
 									<int key="NSvFlags">-2147483392</int>
-									<string key="NSFrame">{{1, 287}, {508, 15}}</string>
+									<string key="NSFrame">{{1, 235}, {465, 15}}</string>
 									<reference key="NSSuperview" ref="832680793"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="832680793"/>
 									<string key="NSAction">_doScroller:</string>
-									<double key="NSPercent">9.980916e-01</double>
+									<double key="NSPercent">9.979210e-01</double>
 								</object>
 								<object class="NSClipView" id="522115304">
 									<reference key="NSNextResponder" ref="832680793"/>
@@ -228,7 +229,7 @@
 										<bool key="EncodedWithXMLCoder">YES</bool>
 										<reference ref="1052514209"/>
 									</object>
-									<string key="NSFrame">{{1, 0}, {432, 17}}</string>
+									<string key="NSFrame">{{1, 0}, {480, 17}}</string>
 									<reference key="NSSuperview" ref="832680793"/>
 									<reference key="NSNextKeyView" ref="1052514209"/>
 									<reference key="NSDocView" ref="1052514209"/>
@@ -237,7 +238,7 @@
 								</object>
 								<reference ref="274818157"/>
 							</object>
-							<string key="NSFrame">{{20, 59}, {434, 305}}</string>
+							<string key="NSFrame">{{-1, 35}, {482, 251}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSNextKeyView" ref="854753160"/>
 							<int key="NSsFlags">562</int>
@@ -248,91 +249,52 @@
 							<reference key="NSCornerView" ref="274818157"/>
 							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
 						</object>
-						<object class="NSCustomView" id="351759406">
+						<object class="NSButton" id="297568762">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">292</int>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSButton" id="882966747">
-									<reference key="NSNextResponder" ref="351759406"/>
-									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{106, 12}, {96, 32}}</string>
-									<reference key="NSSuperview" ref="351759406"/>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSButtonCell" key="NSCell" id="1032008525">
-										<int key="NSCellFlags">-2080244224</int>
-										<int key="NSCellFlags2">134217728</int>
-										<string key="NSContents">^IDS_EXCEPTIONS_REMOVEALL_BUTTON</string>
-										<reference key="NSSupport" ref="22228631"/>
-										<reference key="NSControlView" ref="882966747"/>
-										<int key="NSButtonFlags">-2038021889</int>
-										<int key="NSButtonFlags2">129</int>
-										<reference key="NSAlternateImage" ref="22228631"/>
-										<string key="NSAlternateContents"/>
-										<string key="NSKeyEquivalent"/>
-										<int key="NSPeriodicDelay">400</int>
-										<int key="NSPeriodicInterval">75</int>
-									</object>
-								</object>
-								<object class="NSButton" id="297568762">
-									<reference key="NSNextResponder" ref="351759406"/>
-									<int key="NSvFlags">292</int>
-									<string key="NSFrame">{{14, 12}, {92, 32}}</string>
-									<reference key="NSSuperview" ref="351759406"/>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSButtonCell" key="NSCell" id="655968889">
-										<int key="NSCellFlags">-2080244224</int>
-										<int key="NSCellFlags2">134217728</int>
-										<string key="NSContents">^IDS_EXCEPTIONS_REMOVE_BUTTON</string>
-										<reference key="NSSupport" ref="22228631"/>
-										<reference key="NSControlView" ref="297568762"/>
-										<int key="NSButtonFlags">-2038021889</int>
-										<int key="NSButtonFlags2">129</int>
-										<reference key="NSAlternateImage" ref="22228631"/>
-										<string key="NSAlternateContents"/>
-										<string key="NSKeyEquivalent"/>
-										<int key="NSPeriodicDelay">400</int>
-										<int key="NSPeriodicInterval">75</int>
-									</object>
+							<string key="NSFrame">{{7, 5}, {25, 25}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="655968889">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents"/>
+								<reference key="NSSupport" ref="22228631"/>
+								<reference key="NSControlView" ref="297568762"/>
+								<int key="NSButtonFlags">-2033958657</int>
+								<int key="NSButtonFlags2">163</int>
+								<object class="NSCustomResource" key="NSNormalImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">NSRemoveTemplate</string>
 								</object>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
 							</object>
-							<string key="NSFrameSize">{202, 60}</string>
-							<reference key="NSSuperview" ref="1006"/>
-							<string key="NSClassName">GTMWidthBasedTweaker</string>
 						</object>
-						<object class="NSCustomView" id="823075211">
+						<object class="NSButton" id="882966747">
 							<reference key="NSNextResponder" ref="1006"/>
-							<int key="NSvFlags">289</int>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSButton" id="736922088">
-									<reference key="NSNextResponder" ref="823075211"/>
-									<int key="NSvFlags">289</int>
-									<string key="NSFrame">{{0, 12}, {96, 32}}</string>
-									<reference key="NSSuperview" ref="823075211"/>
-									<bool key="NSEnabled">YES</bool>
-									<object class="NSButtonCell" key="NSCell" id="582003056">
-										<int key="NSCellFlags">-2080244224</int>
-										<int key="NSCellFlags2">134217728</int>
-										<string key="NSContents">^IDS_DONE</string>
-										<reference key="NSSupport" ref="22228631"/>
-										<reference key="NSControlView" ref="736922088"/>
-										<int key="NSButtonFlags">-2038021889</int>
-										<int key="NSButtonFlags2">129</int>
-										<reference key="NSAlternateImage" ref="22228631"/>
-										<string key="NSAlternateContents"/>
-										<string key="NSKeyEquivalent"/>
-										<int key="NSPeriodicDelay">400</int>
-										<int key="NSPeriodicInterval">75</int>
-									</object>
-								</object>
-							</object>
-							<string key="NSFrame">{{364, 0}, {110, 60}}</string>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{40, 5}, {96, 25}}</string>
 							<reference key="NSSuperview" ref="1006"/>
-							<string key="NSClassName">GTMWidthBasedTweaker</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="1032008525">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">^IDS_EXCEPTIONS_REMOVEALL_BUTTON</string>
+								<reference key="NSSupport" ref="22228631"/>
+								<reference key="NSControlView" ref="882966747"/>
+								<int key="NSButtonFlags">-2038152961</int>
+								<int key="NSButtonFlags2">163</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
+							</object>
 						</object>
 					</object>
-					<string key="NSFrameSize">{474, 384}</string>
+					<string key="NSFrameSize">{480, 285}</string>
 					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@ -342,9 +304,6 @@
 			<object class="NSCustomObject" id="792052397">
 				<string key="NSClassName">ChromeUILocalizer</string>
 			</object>
-			<object class="NSCustomObject" id="851102986">
-				<string key="NSClassName">GTMUILocalizerAndLayoutTweaker</string>
-			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<object class="NSMutableArray" key="connectionRecords">
@@ -429,38 +388,6 @@
 					</object>
 					<int key="connectionID">37</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">closeSheet:</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="736922088"/>
-					</object>
-					<int key="connectionID">41</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">localizer_</string>
-						<reference key="source" ref="851102986"/>
-						<reference key="destination" ref="792052397"/>
-					</object>
-					<int key="connectionID">45</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">uiObject_</string>
-						<reference key="source" ref="851102986"/>
-						<reference key="destination" ref="1005"/>
-					</object>
-					<int key="connectionID">46</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">doneButton_</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="736922088"/>
-					</object>
-					<int key="connectionID">47</int>
-				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -505,9 +432,9 @@
 						<reference key="object" ref="1006"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="351759406"/>
-							<reference ref="823075211"/>
 							<reference ref="832680793"/>
+							<reference ref="297568762"/>
+							<reference ref="882966747"/>
 						</object>
 						<reference key="parent" ref="1005"/>
 					</object>
@@ -572,33 +499,13 @@
 						<reference key="parent" ref="20203331"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">20</int>
-						<reference key="object" ref="792052397"/>
-						<reference key="parent" ref="13599172"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">38</int>
-						<reference key="object" ref="839692131"/>
-						<reference key="parent" ref="332085935"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">42</int>
-						<reference key="object" ref="351759406"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="297568762"/>
-							<reference ref="882966747"/>
-						</object>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">16</int>
 						<reference key="object" ref="297568762"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="655968889"/>
 						</object>
-						<reference key="parent" ref="351759406"/>
+						<reference key="parent" ref="1006"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">17</int>
@@ -606,36 +513,13 @@
 						<reference key="parent" ref="297568762"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">43</int>
-						<reference key="object" ref="823075211"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="736922088"/>
-						</object>
-						<reference key="parent" ref="1006"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">39</int>
-						<reference key="object" ref="736922088"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="582003056"/>
-						</object>
-						<reference key="parent" ref="823075211"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">40</int>
-						<reference key="object" ref="582003056"/>
-						<reference key="parent" ref="736922088"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">18</int>
 						<reference key="object" ref="882966747"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="1032008525"/>
 						</object>
-						<reference key="parent" ref="351759406"/>
+						<reference key="parent" ref="1006"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">19</int>
@@ -643,10 +527,15 @@
 						<reference key="parent" ref="882966747"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">44</int>
-						<reference key="object" ref="851102986"/>
+						<int key="objectID">20</int>
+						<reference key="object" ref="792052397"/>
 						<reference key="parent" ref="13599172"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">38</int>
+						<reference key="object" ref="839692131"/>
+						<reference key="parent" ref="332085935"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -674,9 +563,6 @@
 					<string>2.IBPluginDependency</string>
 					<string>20.IBPluginDependency</string>
 					<string>38.IBPluginDependency</string>
-					<string>39.IBPluginDependency</string>
-					<string>40.IBPluginDependency</string>
-					<string>44.IBPluginDependency</string>
 					<string>5.IBPluginDependency</string>
 					<string>6.IBPluginDependency</string>
 					<string>7.IBPluginDependency</string>
@@ -688,10 +574,10 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{125, 434}, {474, 384}}</string>
+					<string>{{128, 406}, {480, 285}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{125, 434}, {474, 384}}</string>
-					<boolean value="NO"/>
+					<string>{{128, 406}, {480, 285}}</string>
+					<integer value="1"/>
 					<string>{196, 240}</string>
 					<string>{{357, 418}, {480, 270}}</string>
 					<boolean value="YES"/>
@@ -711,9 +597,6 @@
 					<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>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -736,7 +619,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">47</int>
+			<int key="maxID">38</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -773,56 +656,12 @@
 					</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="917742388">
-						<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="917742388"/>
-				</object>
-				<object class="IBPartialClassDescription">
 					<string key="className">GeolocationExceptionsWindowController</string>
 					<string key="superclassName">NSWindowController</string>
 					<object class="NSMutableDictionary" key="actions">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSMutableArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>closeSheet:</string>
 							<string>removeAllExceptions:</string>
 							<string>removeException:</string>
 						</object>
@@ -830,14 +669,12 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSMutableArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>doneButton_</string>
 							<string>removeAllButton_</string>
 							<string>removeButton_</string>
 							<string>tableView_</string>
@@ -846,7 +683,6 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NSButton</string>
 							<string>NSButton</string>
-							<string>NSButton</string>
 							<string>NSTableView</string>
 						</object>
 					</object>
@@ -859,13 +695,6 @@
 					<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/status_bubble_mac.h</string>
 					</object>
 				</object>
diff --git a/chrome/browser/cocoa/content_exceptions_window_controller.h b/chrome/browser/cocoa/content_exceptions_window_controller.h
index 1d1bc2a..91a5b33 100644
--- a/chrome/browser/cocoa/content_exceptions_window_controller.h
+++ b/chrome/browser/cocoa/content_exceptions_window_controller.h
@@ -24,7 +24,6 @@ class UpdatingContentSettingsObserver;
   IBOutlet NSButton* addButton_;
   IBOutlet NSButton* removeButton_;
   IBOutlet NSButton* removeAllButton_;
-  IBOutlet NSButton* doneButton_;
 
   ContentSettingsType settingsType_;
   HostContentSettingsMap* settingsMap_;  // weak
@@ -46,22 +45,14 @@ class UpdatingContentSettingsObserver;
   scoped_ptr<HostContentSettingsMap::PatternSettingPair> newException_;
 }
 
-// Returns the content exceptions window controller for |settingsType|.
+// Shows or makes frontmost the content exceptions window for |settingsType|.
 // Changes made by the user in the window are persisted in |settingsMap|.
-+ (id)controllerForType:(ContentSettingsType)settingsType
-            settingsMap:(HostContentSettingsMap*)settingsMap;
-
-// Shows the exceptions dialog as a modal sheet attached to |window|.
-- (void)attachSheetTo:(NSWindow*)window;
-
-// Sets the minimum width of the sheet and resizes it if necessary.
-- (void)setMinWidth:(CGFloat)minWidth;
++ (id)showForType:(ContentSettingsType)settingsType
+      settingsMap:(HostContentSettingsMap*)settingsMap;
 
 - (IBAction)addException:(id)sender;
 - (IBAction)removeException:(id)sender;
 - (IBAction)removeAllExceptions:(id)sender;
-// Closes the sheet and ends the modal loop.
-- (IBAction)closeSheet:(id)sender;
 
 @end
 
diff --git a/chrome/browser/cocoa/content_exceptions_window_controller.mm b/chrome/browser/cocoa/content_exceptions_window_controller.mm
index 0ebcb8e..de51985 100644
--- a/chrome/browser/cocoa/content_exceptions_window_controller.mm
+++ b/chrome/browser/cocoa/content_exceptions_window_controller.mm
@@ -140,13 +140,14 @@ static ContentExceptionsWindowController*
 
 @implementation ContentExceptionsWindowController
 
-+ (id)controllerForType:(ContentSettingsType)settingsType
-            settingsMap:(HostContentSettingsMap*)settingsMap {
++ (id)showForType:(ContentSettingsType)settingsType
+      settingsMap:(HostContentSettingsMap*)settingsMap {
   if (!g_exceptionWindows[settingsType]) {
     g_exceptionWindows[settingsType] =
         [[ContentExceptionsWindowController alloc] initWithType:settingsType
                                                     settingsMap:settingsMap];
   }
+  [g_exceptionWindows[settingsType] showWindow:nil];
   return g_exceptionWindows[settingsType];
 }
 
@@ -178,9 +179,12 @@ static ContentExceptionsWindowController*
 
   [[self window] setTitle:GetWindowTitle(settingsType_)];
 
-  CGFloat minWidth = [[addButton_ superview] bounds].size.width +
-                     [[doneButton_ superview] bounds].size.width;
-  [self setMinWidth:minWidth];
+  // Make sure the button fits its label, but keep it the same height as the
+  // other two buttons.
+  [GTMUILocalizerAndLayoutTweaker sizeToFitView:removeAllButton_];
+  NSSize size = [removeAllButton_ frame].size;
+  size.height = NSHeight([addButton_ frame]);
+  [removeAllButton_ setFrameSize:size];
 
   [self adjustEditingButtons];
 
@@ -199,16 +203,12 @@ static ContentExceptionsWindowController*
   NSCell* patternCell =
       [[tableView_ tableColumnWithIdentifier:@"pattern"] dataCell];
   [patternCell setFormatter:[[[PatternFormatter alloc] init] autorelease]];
-}
 
-- (void)setMinWidth:(CGFloat)minWidth {
-  NSWindow* window = [self window];
-  [window setMinSize:NSMakeSize(minWidth, [window minSize].height)];
-  if ([window frame].size.width < minWidth) {
-    NSRect frame = [window frame];
-    frame.size.width = minWidth;
-    [window setFrame:frame display:NO];
-  }
+  // Give the button bar on the bottom of the window the "iTunes/iChat" look.
+  [[self window] setAutorecalculatesContentBorderThickness:NO
+                                                   forEdge:NSMinYEdge];
+  [[self window] setContentBorderThickness:kButtonBarHeight
+                                   forEdge:NSMinYEdge];
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
@@ -235,7 +235,7 @@ static ContentExceptionsWindowController*
       [self removeException:self];
     }
   } else {
-    [self closeSheet:self];
+    [self close];
   }
 }
 
@@ -264,21 +264,6 @@ static ContentExceptionsWindowController*
   [super keyDown:event];
 }
 
-- (void)attachSheetTo:(NSWindow*)window {
-  [NSApp beginSheet:[self window]
-     modalForWindow:window
-      modalDelegate:self
-     didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:)
-        contextInfo:nil];
-}
-
-- (void)sheetDidEnd:(NSWindow*)sheet
-         returnCode:(NSInteger)returnCode
-        contextInfo:(void*)context {
-  [sheet close];
-  [sheet orderOut:self];
-}
-
 - (IBAction)addException:(id)sender {
   if (newException_.get()) {
     // The invariant is that |newException_| is non-NULL exactly if the pattern
@@ -325,10 +310,6 @@ static ContentExceptionsWindowController*
   [self modelDidChange];
 }
 
-- (IBAction)closeSheet:(id)sender {
-  [NSApp endSheet:[self window]];
-}
-
 // Table View Data Source -----------------------------------------------------
 
 - (NSInteger)numberOfRowsInTableView:(NSTableView*)table {
diff --git a/chrome/browser/cocoa/content_settings_dialog_controller.h b/chrome/browser/cocoa/content_settings_dialog_controller.h
index 187f7f8..5f6127a 100644
--- a/chrome/browser/cocoa/content_settings_dialog_controller.h
+++ b/chrome/browser/cocoa/content_settings_dialog_controller.h
@@ -35,9 +35,6 @@ class Profile;
 +(id)showContentSettingsForType:(ContentSettingsType)settingsType
                         profile:(Profile*)profile;
 
-// Closes an exceptions sheet, if one is attached.
-- (void)closeExceptionsSheet;
-
 - (IBAction)showCookies:(id)sender;
 - (IBAction)openFlashPlayerSettings:(id)sender;
 - (IBAction)openPluginsPage:(id)sender;
diff --git a/chrome/browser/cocoa/content_settings_dialog_controller.mm b/chrome/browser/cocoa/content_settings_dialog_controller.mm
index fcca282..88034ff 100644
--- a/chrome/browser/cocoa/content_settings_dialog_controller.mm
+++ b/chrome/browser/cocoa/content_settings_dialog_controller.mm
@@ -135,7 +135,6 @@ class PrefObserverBridge : public NotificationObserver {
 
   [g_instance selectTab:settingsType];
   [g_instance showWindow:nil];
-  [g_instance closeExceptionsSheet];
   return g_instance;
 }
 
@@ -159,13 +158,6 @@ class PrefObserverBridge : public NotificationObserver {
   return self;
 }
 
-- (void)closeExceptionsSheet {
-  NSWindow* attachedSheet = [[self window] attachedSheet];
-  if (attachedSheet) {
-    [NSApp endSheet:attachedSheet];
-  }
-}
-
 - (void)awakeFromNib {
   DCHECK([self window]);
   DCHECK_EQ(self, [[self window] delegate]);
@@ -312,15 +304,13 @@ class PrefObserverBridge : public NotificationObserver {
 - (IBAction)showGeolocationExceptions:(id)sender {
   GeolocationContentSettingsMap* settingsMap =
       profile_->GetGeolocationContentSettingsMap();
-  [[GeolocationExceptionsWindowController controllerWithSettingsMap:settingsMap]
-      attachSheetTo:[self window]];
+  [GeolocationExceptionsWindowController showWindowWithSettingsMap:settingsMap];
 }
 
 - (void)showExceptionsForType:(ContentSettingsType)settingsType {
   HostContentSettingsMap* settingsMap = profile_->GetHostContentSettingsMap();
-  [[ContentExceptionsWindowController controllerForType:settingsType
-                                            settingsMap:settingsMap]
-      attachSheetTo:[self window]];
+  [ContentExceptionsWindowController showForType:settingsType
+                                     settingsMap:settingsMap];
 }
 
 - (void)setImagesEnabledIndex:(NSInteger)value {
diff --git a/chrome/browser/cocoa/geolocation_exceptions_window_controller.h b/chrome/browser/cocoa/geolocation_exceptions_window_controller.h
index f93b9af..9de67a1 100644
--- a/chrome/browser/cocoa/geolocation_exceptions_window_controller.h
+++ b/chrome/browser/cocoa/geolocation_exceptions_window_controller.h
@@ -20,7 +20,6 @@ class GeolocationObserverBridge;
   IBOutlet NSTableView* tableView_;
   IBOutlet NSButton* removeButton_;
   IBOutlet NSButton* removeAllButton_;
-  IBOutlet NSButton* doneButton_;
 
   GeolocationContentSettingsMap* settingsMap_;  // weak
   scoped_ptr<GeolocationContentSettingsTableModel> model_;
@@ -29,13 +28,7 @@ class GeolocationObserverBridge;
 
 // Shows or makes frontmost the geolocation exceptions window.
 // Changes made by the user in the window are persisted in |settingsMap|.
-+ (id)controllerWithSettingsMap:(GeolocationContentSettingsMap*)settingsMap;
-
-// Sets the minimum width of the sheet and resizes it if necessary.
-- (void)setMinWidth:(CGFloat)minWidth;
-
-- (void)attachSheetTo:(NSWindow*)window;
-- (IBAction)closeSheet:(id)sender;
++ (id)showWindowWithSettingsMap:(GeolocationContentSettingsMap*)settingsMap;
 
 - (IBAction)removeException:(id)sender;
 - (IBAction)removeAllExceptions:(id)sender;
diff --git a/chrome/browser/cocoa/geolocation_exceptions_window_controller.mm b/chrome/browser/cocoa/geolocation_exceptions_window_controller.mm
index 7c7bee4..02715bb 100644
--- a/chrome/browser/cocoa/geolocation_exceptions_window_controller.mm
+++ b/chrome/browser/cocoa/geolocation_exceptions_window_controller.mm
@@ -57,11 +57,12 @@ GeolocationExceptionsWindowController* g_exceptionWindow = nil;
 
 @implementation GeolocationExceptionsWindowController
 
-+ (id)controllerWithSettingsMap:(GeolocationContentSettingsMap*)settingsMap {
++ (id)showWindowWithSettingsMap:(GeolocationContentSettingsMap*)settingsMap {
   if (!g_exceptionWindow) {
     g_exceptionWindow = [[GeolocationExceptionsWindowController alloc]
         initWithSettingsMap:settingsMap];
   }
+  [g_exceptionWindow showWindow:nil];
   return g_exceptionWindow;
 }
 
@@ -88,22 +89,20 @@ GeolocationExceptionsWindowController* g_exceptionWindow = nil;
   DCHECK_EQ(self, [tableView_ dataSource]);
   DCHECK_EQ(self, [tableView_ delegate]);
 
-  CGFloat minWidth = [[removeButton_ superview] bounds].size.width +
-                     [[doneButton_ superview] bounds].size.width;
-  [[self window] setMinSize:NSMakeSize(minWidth,
-                                       [[self window] minSize].height)];
+  // Make sure the button fits its label, but keep it the same height as the
+  // other two buttons.
+  [GTMUILocalizerAndLayoutTweaker sizeToFitView:removeAllButton_];
+  NSSize size = [removeAllButton_ frame].size;
+  size.height = NSHeight([removeButton_ frame]);
+  [removeAllButton_ setFrameSize:size];
 
   [self adjustEditingButtons];
-}
 
-- (void)setMinWidth:(CGFloat)minWidth {
-  NSWindow* window = [self window];
-  [window setMinSize:NSMakeSize(minWidth, [window minSize].height)];
-  if ([window frame].size.width < minWidth) {
-    NSRect frame = [window frame];
-    frame.size.width = minWidth;
-    [window setFrame:frame display:NO];
-  }
+  // Give the button bar on the bottom of the window the "iTunes/iChat" look.
+  [[self window] setAutorecalculatesContentBorderThickness:NO
+                                                   forEdge:NSMinYEdge];
+  [[self window] setContentBorderThickness:kButtonBarHeight
+                                   forEdge:NSMinYEdge];
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
@@ -116,7 +115,7 @@ GeolocationExceptionsWindowController* g_exceptionWindow = nil;
 
 // Let esc close the window.
 - (void)cancel:(id)sender {
-  [self closeSheet:self];
+  [self close];
 }
 
 - (void)keyDown:(NSEvent*)event {
@@ -134,25 +133,6 @@ GeolocationExceptionsWindowController* g_exceptionWindow = nil;
   [super keyDown:event];
 }
 
-- (void)attachSheetTo:(NSWindow*)window {
-  [NSApp beginSheet:[self window]
-     modalForWindow:window
-      modalDelegate:self
-     didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:)
-        contextInfo:nil];
-}
-
-- (void)sheetDidEnd:(NSWindow*)sheet
-         returnCode:(NSInteger)returnCode
-        contextInfo:(void*)context {
-  [sheet close];
-  [sheet orderOut:self];
-}
-
-- (IBAction)closeSheet:(id)sender {
-  [NSApp endSheet:[self window]];
-}
-
 - (IBAction)removeException:(id)sender {
   GeolocationContentSettingsTableModel::Rows rows;
   [self selectedRows:&rows];
-- 
cgit v1.1