Cocoa: Fix clipping issue in search engine protector

chrome/browser/ui/cocoa/global_error_bubble_controller.mm

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/global_error_bubble_controller.h"
 
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/util.h"
 #import "chrome/browser/ui/browser.h"
 #import "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/global_error.h"
 #include "grit/generated_resources.h"
+#import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
 // The vertical offset of the wrench bubble from the wrench menu button.
 const CGFloat kWrenchBubblePointOffsetY = 6;
 
 } // namespace
@@ skipping 30 matching lines @@
   [title_ setStringValue:SysUTF16ToNSString(error_->GetBubbleViewTitle())];
   [message_ setStringValue:SysUTF16ToNSString(error_->GetBubbleViewMessage())];
   [acceptButton_ setTitle:
       SysUTF16ToNSString(error_->GetBubbleViewAcceptButtonLabel())];
   string16 cancelLabel = error_->GetBubbleViewCancelButtonLabel();
   if (cancelLabel.empty())
     [cancelButton_ setHidden:YES];
   else
     [cancelButton_ setTitle:SysUTF16ToNSString(cancelLabel)];
 
-  // Adapt window size to bottom buttons. Do this before all other layouting.
+  // First make sure that the window is wide enough to accomidate the buttons.
+  NSRect frame = [[self window] frame];
+  [layoutTweaker_ tweakUI:buttonContainer_];
+  CGFloat delta =  NSWidth([buttonContainer_ frame]) - NSWidth(frame);
+  if (delta > 0) {
+    frame.size.width += delta;
+    [[self window] setFrame:frame display:NO];
+  }
+
+  // Adapt window height to bottom buttons. Do this before all other layouting.
   NSArray* views = [NSArray arrayWithObjects:
-      title_, message_, [acceptButton_ superview], nil];
+      title_, message_, buttonContainer_, nil];
   NSSize ds = NSMakeSize(0, cocoa_l10n_util::VerticallyReflowGroup(views));
   ds = [[self bubble] convertSize:ds toView:nil];
 
-  NSRect frame = [[self window] frame];
   frame.origin.y -= ds.height;
   frame.size.height += ds.height;
   [[self window] setFrame:frame display:YES];
 }
 
 - (void)showWindow:(id)sender {
   BrowserWindowController* bwc = [BrowserWindowController
       browserWindowControllerForWindow:[self parentWindow]];
   [bwc lockBarVisibilityForOwner:self withAnimation:NO delay:NO];
   [super showWindow:sender];
@@ skipping 17 matching lines @@
 - (IBAction)onCancel:(id)sender {
   error_->BubbleViewCancelButtonPressed();
   [self close];
 }
 
 @end
 
 void GlobalError::ShowBubbleView(Browser* browser, GlobalError* error) {
   [GlobalErrorBubbleController showForBrowser:browser error:error];
 }