summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-21 22:00:44 +0000
committerthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-21 22:00:44 +0000
commit8c1bab17754336a875dd36b67299a04f284b6503 (patch)
tree5856cfd60c8bb0eca3577160b6be92c2e2ae4601
parentf4b743ed2ffbd9ebbbaf1fc616a402538bff28d0 (diff)
downloadchromium_src-8c1bab17754336a875dd36b67299a04f284b6503.zip
chromium_src-8c1bab17754336a875dd36b67299a04f284b6503.tar.gz
chromium_src-8c1bab17754336a875dd36b67299a04f284b6503.tar.bz2
[Mac] relayout the import data and clear browser data buttons in the prefs for the string changes that already landed. more work will be needed to make the window match the new wants, but this gets the tests passing again.
BUG=32719 TEST=unittests green up Review URL: http://codereview.chromium.org/551103 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36793 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat
-rw-r--r--chrome/app/nibs/Preferences.xib45
-rw-r--r--chrome/browser/cocoa/preferences_window_controller.mm13
2 files changed, 19 insertions, 39 deletions
diff --git a/chrome/app/nibs/Preferences.xib b/chrome/app/nibs/Preferences.xib
index 9bfb4a3..e84dab9 100644
--- a/chrome/app/nibs/Preferences.xib
+++ b/chrome/app/nibs/Preferences.xib
@@ -2,15 +2,15 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">9L31a</string>
- <string key="IBDocument.InterfaceBuilderVersion">677</string>
+ <string key="IBDocument.SystemVersion">9L30</string>
+ <string key="IBDocument.InterfaceBuilderVersion">680</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="74"/>
- <integer value="482"/>
<integer value="481"/>
+ <integer value="482"/>
+ <integer value="74"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1710,7 +1710,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="173446497">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 202}, {128, 68}}</string>
+ <string key="NSFrame">{{17, 234}, {128, 68}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="218087448">
@@ -1726,7 +1726,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="20640598">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 315}, {128, 60}}</string>
+ <string key="NSFrame">{{17, 347}, {128, 60}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="101746388">
@@ -1742,7 +1742,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSMatrix" id="1019357609">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{152, 232}, {358, 38}}</string>
+ <string key="NSFrame">{{152, 264}, {358, 38}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<int key="NSNumRows">2</int>
@@ -1934,7 +1934,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="667220499">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{146, 194}, {184, 32}}</string>
+ <string key="NSFrame">{{146, 226}, {184, 32}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="745829249">
@@ -1954,7 +1954,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="203729106">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{146, 347}, {184, 32}}</string>
+ <string key="NSFrame">{{146, 379}, {184, 32}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="431766699">
@@ -1990,7 +1990,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="212252045">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 137}, {128, 38}}</string>
+ <string key="NSFrame">{{17, 169}, {128, 38}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="677476881">
@@ -2006,7 +2006,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="155299174">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 67}, {128, 42}}</string>
+ <string key="NSFrame">{{17, 67}, {128, 74}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="340834043">
@@ -2038,7 +2038,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="90260648">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{152, 319}, {361, 28}}</string>
+ <string key="NSFrame">{{152, 351}, {361, 28}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="123936632">
@@ -2055,7 +2055,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="885386403">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{146, 82}, {118, 32}}</string>
+ <string key="NSFrame">{{146, 114}, {118, 32}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="325720834">
@@ -2075,7 +2075,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="987908490">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{264, 82}, {252, 32}}</string>
+ <string key="NSFrame">{{146, 82}, {252, 32}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="551321318">
@@ -2095,7 +2095,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSMatrix" id="854747859">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{152, 137}, {358, 38}}</string>
+ <string key="NSFrame">{{152, 169}, {358, 38}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<int key="NSNumRows">2</int>
@@ -2307,7 +2307,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="1022040155">
<reference key="NSNextResponder" ref="393583039"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{152, 294}, {82, 17}}</string>
+ <string key="NSFrame">{{152, 326}, {82, 17}}</string>
<reference key="NSSuperview" ref="393583039"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1047338722">
@@ -2345,7 +2345,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
</object>
- <string key="NSFrameSize">{530, 395}</string>
+ <string key="NSFrameSize">{530, 427}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
@@ -4136,11 +4136,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="357234760"/>
<reference ref="423027085"/>
<reference ref="865039969"/>
- <reference ref="987908490"/>
<reference ref="20640598"/>
<reference ref="203729106"/>
<reference ref="90260648"/>
<reference ref="1022040155"/>
+ <reference ref="987908490"/>
</object>
<reference key="parent" ref="196155028"/>
<string key="objectName">Personal Stuff View</string>
@@ -5203,7 +5203,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
- <string>{{181, 403}, {530, 395}}</string>
+ <string>{{181, 371}, {530, 427}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{87, 136}, {530, 463}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -5439,13 +5439,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">NSWindow</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">browser/cocoa/nswindow_local_state.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">PreferencesWindowController</string>
<string key="superclassName">NSWindowController</string>
<object class="NSMutableDictionary" key="actions">
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm
index 51030b3..b60868c 100644
--- a/chrome/browser/cocoa/preferences_window_controller.mm
+++ b/chrome/browser/cocoa/preferences_window_controller.mm
@@ -541,21 +541,8 @@ class PrefObserverBridge : public NotificationObserver,
[personalStuffGroupThemes_ objectAtIndex:kThemeResetButtonIndex],
[personalStuffGroupThemes_ objectAtIndex:kThemeThemesButtonIndex]);
- // Size the import buttons row.
- const NSUInteger kBrowserDataGroupCount = 4;
- const NSUInteger kBrowserDataImportButtonIndex = 1;
- const NSUInteger kBrowserDataClearButtonIndex = 2;
- DCHECK_EQ([personalStuffGroupBrowserData_ count], kBrowserDataGroupCount)
- << "Expected only two items in Browser Data group";
- CGFloat browserDataRowChange = SizeToFitButtonPair(
- [personalStuffGroupBrowserData_
- objectAtIndex:kBrowserDataImportButtonIndex],
- [personalStuffGroupBrowserData_
- objectAtIndex:kBrowserDataClearButtonIndex]);
-
// Find the most any row changed in size.
CGFloat maxWidthChange = std::max(defaultBrowserChange.width, themeRowChange);
- maxWidthChange = std::max(maxWidthChange, browserDataRowChange);
// If any grew wider, make the views wider. If they all shrank, they fit the
// existing view widths, so no change is needed//.
generated by cgit v1.1 at 2025-01-31 06:27:45 +0000