Merge 182576 to M26 beta branch.

chrome/browser/ui/cocoa/extensions/extension_install_view_controller.mm

 // Copyright (c) 2012 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/extensions/extension_install_view_controller.h"
 
 #include "base/auto_reset.h"
 #include "base/i18n/rtl.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
@@ skipping 168 matching lines @@
   delegate_->InstallUIAbort(/*user_initiated=*/true);
 }
 
 - (IBAction)ok:(id)sender {
   delegate_->InstallUIProceed();
 }
 
 - (void)awakeFromNib {
   // Set control labels.
   [titleField_ setStringValue:base::SysUTF16ToNSString(prompt_->GetHeading())];
-  [okButton_ setTitle:base::SysUTF16ToNSString(
-      prompt_->GetAcceptButtonLabel())];
+  NSRect okButtonRect;
+  if (prompt_->HasAcceptButtonLabel()) {
+    [okButton_ setTitle:base::SysUTF16ToNSString(
+        prompt_->GetAcceptButtonLabel())];
+  } else {
+    [okButton_ removeFromSuperview];
+    okButtonRect = [okButton_ frame];
+    okButton_ = nil;
+  }
   [cancelButton_ setTitle:prompt_->HasAbortButtonLabel() ?
       base::SysUTF16ToNSString(prompt_->GetAbortButtonLabel()) :
       l10n_util::GetNSString(IDS_CANCEL)];
   if ([self isInlineInstall]) {
     prompt_->AppendRatingStars(AppendRatingStarsShim, self);
     [ratingCountField_ setStringValue:base::SysUTF16ToNSString(
         prompt_->GetRatingCount())];
     [userCountField_ setStringValue:base::SysUTF16ToNSString(
         prompt_->GetUserCount())];
     [[storeLinkButton_ cell] setUnderlineOnHover:YES];
@@ skipping 10 matching lines @@
   // wrapping onto multiple lines. So we accumulate an offset by measuring how
   // big each label wants to be, and comparing it to how big it actually is.
   // Then we shift each label down and resize by the appropriate amount, then
   // finally resize the window.
   CGFloat totalOffset = 0.0;
 
   OffsetControlVerticallyToFitContent(titleField_, &totalOffset);
 
   // Resize |okButton_| and |cancelButton_| to fit the button labels, but keep
   // them right-aligned.
-  NSSize buttonDelta = [GTMUILocalizerAndLayoutTweaker sizeToFitView:okButton_];
-  if (buttonDelta.width) {
-    [okButton_ setFrame:NSOffsetRect([okButton_ frame], -buttonDelta.width, 0)];
-    [cancelButton_ setFrame:NSOffsetRect([cancelButton_ frame],
-                                         -buttonDelta.width, 0)];
+  NSSize buttonDelta;
+  if (okButton_) {
+    buttonDelta = [GTMUILocalizerAndLayoutTweaker sizeToFitView:okButton_];
+    if (buttonDelta.width) {
+      [okButton_ setFrame:NSOffsetRect([okButton_ frame],
+                                       -buttonDelta.width, 0)];
+      [cancelButton_ setFrame:NSOffsetRect([cancelButton_ frame],
+                                           -buttonDelta.width, 0)];
+    }
+  } else {
+    // Make |cancelButton_| right-aligned in the absence of |okButton_|.
+    NSRect cancelButtonRect = [cancelButton_ frame];
+    cancelButtonRect.origin.x =
+        NSMaxX(okButtonRect) - NSWidth(cancelButtonRect);
+    [cancelButton_ setFrame:cancelButtonRect];
   }
   buttonDelta = [GTMUILocalizerAndLayoutTweaker sizeToFitView:cancelButton_];
   if (buttonDelta.width) {
     [cancelButton_ setFrame:NSOffsetRect([cancelButton_ frame],
                                          -buttonDelta.width, 0)];
   }
 
   if ([self isBundleInstall]) {
     // We display the list of extension names as a simple text string, seperated
     // by newlines.
@@ skipping 261 matching lines @@
   return warnings;
 }
 
 - (void)updateViewFrame:(NSRect)frame {
   NSWindow* window = [[self view] window];
   [window setFrame:[window frameRectForContentRect:frame] display:YES];
   [[self view] setFrame:frame];
 }
 
 @end