Constrained window sheet controller (test patch)

chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.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/constrained_window/cw_alert.h"
+#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_alert.h"
 
 #import "base/logging.h"
-#import "chrome/browser/ui/cocoa/constrained_window/cw_button.h"
-#import "chrome/browser/ui/cocoa/constrained_window/cw_window.h"
+#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h"
+#import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h"
 #import "chrome/browser/ui/cocoa/hover_close_button.h"
 #import "chrome/browser/ui/constrained_window.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/cocoa/window_size_constants.h"
 
 namespace {
 
 const CGFloat kWindowMinWidth = 500;
 const CGFloat kButtonGap = 6;
 const CGFloat kButtonMinWidth = 72;
 const CGFloat kCloseButtonSize = 16;
 
+// Creates a label control.
 scoped_nsobject<NSTextField> CreateLabel() {
   scoped_nsobject<NSTextField> label(
       [[NSTextField alloc] initWithFrame:NSZeroRect]);
   [label setEditable:NO];
   [label setSelectable:NO];
   [label setBezeled:NO];
   [label setDrawsBackground:NO];
   return label;
 }
 
+// Calculates the control size that will fit within the given width.
 NSSize CalculateDesiredSizeForWidth(NSTextField* text_field, CGFloat width) {
   NSRect rect = NSMakeRect(0, 0, width, 1000);
   return [[text_field cell] cellSizeForBounds:rect];
 }
 
+// Helper function to create constrained window label string with the given
+// font.
 NSAttributedString* GetAttributedLabelString(
     NSString* string,
     ui::ResourceBundle::FontStyle font_style) {
   const gfx::Font& font =
       ui::ResourceBundle::GetSharedInstance().GetFont(font_style);
   NSColor* color =
       gfx::SkColorToCalibratedNSColor(ConstrainedWindow::kTextColor);
   NSDictionary* attributes = [NSDictionary dictionaryWithObjectsAndKeys:
       font.GetNativeFont(), NSFontAttributeName,
       color, NSForegroundColorAttributeName,
       nil];
   return [[[NSAttributedString alloc] initWithString:string
                                           attributes:attributes] autorelease];
 }
 
 }  // namespace
 
-@interface CWAlert()
-- (void)layoutButtonsWithWindowWidth: (CGFloat)windowWidth;
+@interface ConstrainedWindowAlert ()
+// Position the alert buttons within the given window width.
+- (void)layoutButtonsWithWindowWidth:(CGFloat)windowWidth;
+// Resize the given text field to fit within the window and position it starting
+// at |yPos|. Returns the new value of yPos.
 - (CGFloat)layoutTextField:(NSTextField*)textField
                       yPos:(CGFloat)yPos
                windowWidth:(CGFloat)windowWidth;
+// Positions the accessory view starting at yPos. Returns the new value of yPos.
 - (CGFloat)layoutAccessoryViewAtYPos:(CGFloat)yPos;
+// Update the position of the close button.
 - (void)layoutCloseButtonWithWindowWidth:(CGFloat)windowWidth;
 @end
 
-@implementation CWAlert
+@implementation ConstrainedWindowAlert
 
 - (NSString*)informativeText {
   return [informativeTextField_ stringValue];
 }
 
 - (void)setInformativeText:(NSString*)string {
   [informativeTextField_ setAttributedStringValue:
       GetAttributedLabelString(string, ConstrainedWindow::kTextFontStyle)];
 }
 
@@ skipping 23 matching lines @@
 - (NSButton*)closeButton {
   return closeButton_;
 }
 
 - (NSWindow*)window {
   return window_;
 }
 
 - (id)init {
   if ((self = [super init])) {
-    window_.reset([[CWWindow alloc]
+    window_.reset([[ConstrainedWindowCustomWindow alloc]
         initWithContentRect:ui::kWindowSizeDeterminedLater]);
     [window_ setReleasedWhenClosed:NO];
     NSView* content_view = [window_ contentView];
 
     informativeTextField_ = CreateLabel();
     [content_view addSubview:informativeTextField_];
     messageTextField_ = CreateLabel();
     [content_view addSubview:messageTextField_];
 
     closeButton_.reset([[HoverCloseButton alloc] initWithFrame:NSZeroRect]);
     [content_view addSubview:closeButton_];
   }
   return self;
 }
 
 - (void)addButtonWithTitle:(NSString*)title
-             keyEquivalent:(NSString*)keyEquivalent {
+             keyEquivalent:(NSString*)keyEquivalent
+                    target:(id)target
+                    action:(SEL)action {
   if (!buttons_.get())
     buttons_.reset([[NSMutableArray alloc] init]);
-  NSButton* button = [[CWButton alloc] initWithFrame:NSZeroRect];
+  NSButton* button = [[ConstrainedWindowButton alloc] initWithFrame:NSZeroRect];
   [button setTitle:title];
   [button setKeyEquivalent:keyEquivalent];
+  [button setTarget:target];
+  [button setAction:action];
   [buttons_ addObject:button];
   [[window_ contentView] addSubview:button];
 }
 
 - (void)layout {
   // Button width
   CGFloat buttonWidth = 0;
   for (NSButton* button in buttons_.get()) {
     [button sizeToFit];
     NSSize size = [button frame].size;
@@ skipping 23 matching lines @@
                           yPos:curY
                    windowWidth:windowWidth - kCloseButtonSize - kButtonGap];
   [self layoutCloseButtonWithWindowWidth:windowWidth];
 
   // Update window frame
   curY += ConstrainedWindow::kVerticalPadding;
   [window_ setFrame:NSMakeRect(0, 0, windowWidth, curY)
             display:NO];
 }
 
-- (void)layoutButtonsWithWindowWidth: (CGFloat)windowWidth {
+- (void)layoutButtonsWithWindowWidth:(CGFloat)windowWidth {
   // Layout first 2 button right to left.
   CGFloat curX = windowWidth - ConstrainedWindow::kHorizontalPadding;
   const int buttonCount = [buttons_ count];
   DCHECK_GE(buttonCount, 2);
   for (int i = 0; i < 2; ++i) {
     NSButton* button = [buttons_ objectAtIndex:i];
     NSRect rect = [button frame];
     rect.origin.x = curX - NSWidth(rect);
     rect.origin.y = ConstrainedWindow::kVerticalPadding;
     [button setFrameOrigin:rect.origin];
@@ skipping 42 matching lines @@
   NSRect frame;
   frame.size.width = kCloseButtonSize;
   frame.size.height = kCloseButtonSize;
   frame.origin.x =
       windowWidth - ConstrainedWindow::kHorizontalPadding - NSWidth(frame);
   frame.origin.y = NSMaxY([messageTextField_ frame]) - NSHeight(frame);
   [closeButton_ setFrame:frame];
 }
 
 @end