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"
@@ skipping 109 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]);

[groby-ooo-7-16, 2014/03/04 21:04:01]

I'm surprised this doesn't generate a warning - you're forward-calling an
undefined method.

[leng, 2014/03/04 23:35:52]

There are a bunch of these.

+  [closeButton setFrameOrigin:NSMakePoint(
+      NSMaxX(bubbleFrame), yOffset - chrome_style::kCloseButtonPadding)];
+  bubbleFrame.size.width +=
+      NSWidth([closeButton frame]) + chrome_style::kCloseButtonPadding;

[groby-ooo-7-16, 2014/03/04 21:04:01]

Wait - why is this adding twice the width? Border padding? You should probably
call it out in a separate constant, for clarity.

[leng, 2014/03/04 23:35:52]

I don't think I'm adding the width twice?  I've put some comments - do they
help?

[groby-ooo-7-16, 2014/03/05 00:19:05]

Never mind. kCloseButtonPadding somehow looked like kCloseButtonSize to me.
Obviously, I am not sufficiently caffeinated.

+  [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 {

[groby-ooo-7-16, 2014/03/04 21:04:01]

Please add to private api.

[leng, 2014/03/04 23:35:52]

Done.

+  int dimension = chrome_style::GetCloseButtonSize();
+  NSRect frame = NSMakeRect(0, 0, dimension, dimension);
+  base::scoped_nsobject<NSButton> button(
+      [[WebUIHoverCloseButton alloc] initWithFrame:frame]);
+  [button setAction:@selector(onBlock:)];

[groby-ooo-7-16, 2014/03/04 21:04:01]

Is "close" really the same as "block"? Shouldn't it be "leave as is"/"ask again
later"?

[leng, 2014/03/04 23:35:52]

Done.

+  [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)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