Pick up newer GTM

Switch a bunch of window sizing over to use the helper so it's completely in all cases.

BUG=none
TEST=about box, hung renderer, edit search engine, and http auto still size correctly.
Review URL: http://codereview.chromium.org/201137

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26369 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 18 insertions, 25 deletions

diff --git a/DEPS b/DEPS
index 0172b49..c694e27 100644
--- a/DEPS
+++ b/DEPS
@@ -102,7 +102,7 @@ deps_os = {
   },
   "mac": {
     "src/third_party/GTM":
-      "http://google-toolbox-for-mac.googlecode.com/svn/trunk@212",
+      "http://google-toolbox-for-mac.googlecode.com/svn/trunk@217",
     "src/third_party/pdfsqueeze":
       "http://pdfsqueeze.googlecode.com/svn/trunk@2",
     "src/third_party/WebKit/WebKit/mac":
diff --git a/chrome/browser/cocoa/about_window_controller.mm b/chrome/browser/cocoa/about_window_controller.mm
index 5280c26..2dff4ed 100644
--- a/chrome/browser/cocoa/about_window_controller.mm
+++ b/chrome/browser/cocoa/about_window_controller.mm
@@ -240,12 +240,10 @@ NSAttributedString* BuildLegalTextBlock() {
   rect.origin.y = rect.origin.y - updateShift + legalShift;
   [backgroundView_ setFrame:rect];
 
-  NSWindow* window = [self window];
-  [[window contentView] setAutoresizesSubviews:NO];
-  rect = [window frame];
-  rect.size.height = rect.size.height - updateShift + legalShift;
-  [window setFrame:rect display:NO];
-  [[window contentView] setAutoresizesSubviews:YES];
+  NSSize windowDelta = NSMakeSize(0, (legalShift - updateShift));
+  [GTMUILocalizerAndLayoutTweaker
+      resizeWindowWithoutAutoResizingSubViews:[self window]
+                                        delta:windowDelta];
 }
 
 - (KeystoneGlue*)defaultKeystoneGlue {
diff --git a/chrome/browser/cocoa/edit_search_engine_cocoa_controller.mm b/chrome/browser/cocoa/edit_search_engine_cocoa_controller.mm
index d159963..00e4913 100644
--- a/chrome/browser/cocoa/edit_search_engine_cocoa_controller.mm
+++ b/chrome/browser/cocoa/edit_search_engine_cocoa_controller.mm
@@ -71,18 +71,17 @@ void ShiftOriginY(NSView* view, CGFloat amount) {
 
   // Resize the window.
   NSWindow* window = [self window];
-  [[window contentView] setAutoresizesSubviews:NO];
-  rect = [window frame];
-  rect.size.height += descriptionShift;
-  [window setFrame:rect display:NO];
-  [[window contentView] setAutoresizesSubviews:YES];
+  NSSize windowDelta = NSMakeSize(0, descriptionShift);
+  [GTMUILocalizerAndLayoutTweaker
+      resizeWindowWithoutAutoResizingSubViews:window
+                                        delta:windowDelta];
 
   ResourceBundle& bundle = ResourceBundle::GetSharedInstance();
   goodImage_.reset([bundle.GetNSImageNamed(IDR_INPUT_GOOD) retain]);
   badImage_.reset([bundle.GetNSImageNamed(IDR_INPUT_ALERT) retain]);
   if (templateURL_) {
     // Defaults to |..._NEW_WINDOW_TITLE|.
-    [[self window] setTitle:l10n_util::GetNSString(
+    [window setTitle:l10n_util::GetNSString(
       IDS_SEARCH_ENGINES_EDITOR_EDIT_WINDOW_TITLE)];
     [nameField_ setStringValue:
         base::SysWideToNSString(templateURL_->short_name())];
diff --git a/chrome/browser/cocoa/hung_renderer_controller.mm b/chrome/browser/cocoa/hung_renderer_controller.mm
index e401e8b..54c4c9d 100644
--- a/chrome/browser/cocoa/hung_renderer_controller.mm
+++ b/chrome/browser/cocoa/hung_renderer_controller.mm
@@ -59,12 +59,10 @@ HungRendererController* g_instance = NULL;
   [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];
+  NSSize windowDelta = NSMakeSize(0, messageShift);
+  [GTMUILocalizerAndLayoutTweaker
+      resizeWindowWithoutAutoResizingSubViews:[self window]
+                                        delta:windowDelta];
 }
 
 - (IBAction)kill:(id)sender {
diff --git a/chrome/browser/login_prompt_mac.mm b/chrome/browser/login_prompt_mac.mm
index 2264c26..8a9e93c 100644
--- a/chrome/browser/login_prompt_mac.mm
+++ b/chrome/browser/login_prompt_mac.mm
@@ -362,12 +362,10 @@ LoginHandler* LoginHandler::Create(URLRequest* request, MessageLoop* ui_loop) {
        sizeToFitFixedWidthTextField:explanationField_];
 
   // Resize the window (no shifting needed due to window layout).
-  NSWindow* window = [self window];
-  [[window contentView] setAutoresizesSubviews:NO];
-  NSRect rect = [window frame];
-  rect.size.height = rect.size.height + explanationShift;
-  [window setFrame:rect display:NO];
-  [[window contentView] setAutoresizesSubviews:YES];
+  NSSize windowDelta = NSMakeSize(0, explanationShift);
+  [GTMUILocalizerAndLayoutTweaker
+      resizeWindowWithoutAutoResizingSubViews:[self window]
+                                        delta:windowDelta];
 }
 
 @end