Adds close button to cocoa permissions bubble.

chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm

 // Copyright 2014 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/website_settings/permission_bubble_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #import "chrome/browser/ui/chrome_style.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h"
+#import "chrome/browser/ui/cocoa/hover_close_button.h"
 #import "chrome/browser/ui/cocoa/hyperlink_text_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #include "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_view.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/generated_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/cocoa/window_size_constants.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 using base::UserMetricsAction;
 
 namespace {
 const CGFloat kHorizontalPadding = 20.0f;
 const CGFloat kVerticalPadding = 20.0f;
 const CGFloat kButtonPadding = 10.0f;
 const CGFloat kCheckboxYAdjustment = 2.0f;
 
 const CGFloat kFontSize = 15.0f;
 const base::char16 kBulletPoint = 0x2022;
 
 }  // namespace
 
 @interface PermissionBubbleController ()
 
+// Returns an autoreleased NSView displaying the label for |request|.
+- (NSView*)labelForRequest:(PermissionBubbleRequest*)request
+           isSingleRequest:(BOOL)singleRequest;
+
+// Returns an autoreleased NSView displaying the title for the bubble if
+// there are multiple requests.
+- (NSView*)titleForMultipleRequests;
+
+// Returns an autoreleased NSView displaying a checkbox for |request|.  The
+// checkbox will be initialized as checked if |checked| is YES.
+- (NSView*)checkboxForRequest:(PermissionBubbleRequest*)request
+                      checked:(BOOL)checked;
+
+// Returns an autoreleased NSView displaying the customize button.
+- (NSView*)customizationButton;
+
+// Returns an autoreleased NSView of a button with |title| and |action|.
+// If |pairedButton| is non-nil, the size of both buttons will be set to be
+// equal to the size of the larger of the two.
+- (NSView*)buttonWithTitle:(NSString*)title
+                    action:(SEL)action
+                pairedWith:(NSView*)pairedButton;
+
+// Returns an autoreleased NSView displaying the close 'x' button.
+- (NSView*)closeButton;
+
 // Called when the 'ok' button is pressed.
 - (void)ok:(id)sender;
 
 // Called when the 'allow' button is pressed.
 - (void)onAllow:(id)sender;
 
 // Called when the 'block' button is pressed.
 - (void)onBlock:(id)sender;
 
+// Called when the 'close' button is pressed.
+- (void)onClose:(id)sender;
+
 // Called when the 'customize' button is pressed.
 - (void)onCustomize:(id)sender;
 
 // Called when a checkbox changes from checked to unchecked, or vice versa.
 - (void)onCheckboxChanged:(id)sender;
 
+
 @end
 
 @implementation PermissionBubbleController
 
 - (id)initWithParentWindow:(NSWindow*)parentWindow
                     bridge:(PermissionBubbleCocoa*)bridge {
   DCHECK(parentWindow);
   DCHECK(bridge);
   base::scoped_nsobject<InfoBubbleWindow> window([[InfoBubbleWindow alloc]
       initWithContentRect:ui::kWindowSizeDeterminedLater
@@ skipping 67 matching lines @@
 
   // The maximum width of the above permissions will dictate the width of the
   // bubble.  It is calculated here so that it can be used for the positioning
   // of the buttons.
   NSRect bubbleFrame = NSZeroRect;
   for (NSView* view in [contentView subviews]) {
     bubbleFrame = NSUnionRect(
         bubbleFrame, NSInsetRect([view frame], -kHorizontalPadding, 0));
   }
 
+  // 'x' button in the upper-right-hand corner.
+  base::scoped_nsobject<NSView> closeButton([[self closeButton] retain]);
+  // Place the close button at the rightmost edge of the bubble.
+  [closeButton setFrameOrigin:NSMakePoint(
+      NSMaxX(bubbleFrame), yOffset - chrome_style::kCloseButtonPadding)];
+  // Increase the size of the bubble by the width of the close button and its
+  // padding.
+  bubbleFrame.size.width +=
+      NSWidth([closeButton frame]) + chrome_style::kCloseButtonPadding;
+  [contentView addSubview:closeButton];
+
   // Position the allow/ok button.
   CGFloat xOrigin = NSWidth(bubbleFrame) - NSWidth([allowOrOkButton frame]) -
       kHorizontalPadding;
   [allowOrOkButton setFrameOrigin:NSMakePoint(xOrigin, kVerticalPadding)];
   [contentView addSubview:allowOrOkButton];
 
   if (!customizationMode) {
     base::scoped_nsobject<NSView> blockButton(
         [[self buttonWithTitle:@"Block"
                         action:@selector(onBlock:)
@@ skipping 117 matching lines @@
   if (pairedButton) {
     NSRect buttonFrame = [button frame];
     NSRect pairedFrame = [pairedButton frame];
     CGFloat width = std::max(NSWidth(buttonFrame), NSWidth(pairedFrame));
     [button setFrameSize:NSMakeSize(width, buttonFrame.size.height)];
     [pairedButton setFrameSize:NSMakeSize(width, pairedFrame.size.height)];
   }
   return button.autorelease();
 }
 
+- (NSView*)closeButton {
+  int dimension = chrome_style::GetCloseButtonSize();
+  NSRect frame = NSMakeRect(0, 0, dimension, dimension);
+  base::scoped_nsobject<NSButton> button(
+      [[WebUIHoverCloseButton alloc] initWithFrame:frame]);
+  [button setAction:@selector(onClose:)];
+  [button setTarget:self];
+  return button.autorelease();
+}
+
 - (void)ok:(id)sender {
   DCHECK(delegate_);
   delegate_->Closing();
 }
 
 - (void)onAllow:(id)sender {
   DCHECK(delegate_);
   delegate_->Accept();
 }
 
 - (void)onBlock:(id)sender {
   DCHECK(delegate_);
   delegate_->Deny();
 }
 
+- (void)onClose:(id)sender {
+  DCHECK(delegate_);
+  delegate_->Closing();
+}
+
 - (void)onCustomize:(id)sender {
   DCHECK(delegate_);
   delegate_->SetCustomizationMode();
 }
 
 - (void)onCheckboxChanged:(id)sender {
   DCHECK(delegate_);
   NSButton* checkbox = base::mac::ObjCCastStrict<NSButton>(sender);
   delegate_->ToggleAccept([checkbox tag], [checkbox state] == NSOnState);
 }
 
 @end  // implementation PermissionBubbleController