Use customization mode by default in permission bubbles

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/bind_objc_block.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 39 matching lines @@
 class MenuDelegate : public ui::SimpleMenuModel::Delegate {
  public:
   explicit MenuDelegate(PermissionBubbleController* bubble)
       : bubble_controller_(bubble) {}
   bool IsCommandIdChecked(int command_id) const override { return false; }
   bool IsCommandIdEnabled(int command_id) const override { return true; }
   bool GetAcceleratorForCommandId(int command_id,
                                   ui::Accelerator* accelerator) override {
     return false;
   }
-  void ExecuteCommand(int command_id, int event_flags) override {
-    [bubble_controller_ onMenuItemClicked:command_id];
-  }
  private:
   PermissionBubbleController* bubble_controller_;  // Weak, owns us.
   DISALLOW_COPY_AND_ASSIGN(MenuDelegate);
 };
 
 }  // namespace
 
 // NSPopUpButton with a menu containing two items: allow and block.
-// One AllowBlockMenuButton is used for each requested permission, but only when
-// the permission bubble is in 'customize' mode.
+// One AllowBlockMenuButton is used for each requested permission when there are
+// multiple permissions in the bubble.
 @interface AllowBlockMenuButton : NSPopUpButton {
  @private
   scoped_ptr<PermissionMenuModel> menuModel_;
   base::scoped_nsobject<MenuController> menuController_;
 }
 
 - (id)initForURL:(const GURL&)url
          allowed:(BOOL)allow
            index:(int)index
         delegate:(PermissionBubbleView::Delegate*)delegate;
@@ skipping 93 matching lines @@
                   atIndex:(int)index
                     allow:(BOOL)allow;
 
 // Returns an autoreleased NSView of a button with |title| and |action|.
 - (NSView*)buttonWithTitle:(NSString*)title
                     action:(SEL)action;
 
 // Returns an autoreleased NSView displaying a block button.
 - (NSView*)blockButton;
 
-// Returns an autoreleased NSView with a block button and a drop-down menu
-// with one item, which will change the UI to allow customizing the permissions.
-- (NSView*)blockButtonWithCustomizeMenu;
-
 // 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;
-
 // Sets the width of both |viewA| and |viewB| to be the larger of the
 // two views' widths.  Does not change either view's origin or height.
 + (CGFloat)matchWidthsOf:(NSView*)viewA andOf:(NSView*)viewB;
 
 // Sets the offset of |viewA| so that its vertical center is aligned with the
 // vertical center of |viewB|.
 + (void)alignCenterOf:(NSView*)viewA verticallyToCenterOf:(NSView*)viewB;
 
 @end
 
@@ skipping 42 matching lines @@
 }
 
 - (void)parentWindowDidMove:(NSNotification*)notification {
   DCHECK(bridge_);
   [self setAnchorPoint:bridge_->GetAnchorPoint()];
 }
 
 - (void)showAtAnchor:(NSPoint)anchorPoint
          withDelegate:(PermissionBubbleView::Delegate*)delegate
           forRequests:(const std::vector<PermissionBubbleRequest*>&)requests
-         acceptStates:(const std::vector<bool>&)acceptStates
-    customizationMode:(BOOL)customizationMode {
+         acceptStates:(const std::vector<bool>&)acceptStates {
   DCHECK(!requests.empty());
   DCHECK(delegate);
-  DCHECK(!customizationMode || (requests.size() == acceptStates.size()));
   delegate_ = delegate;
 
   NSView* contentView = [[self window] contentView];
   [contentView setSubviews:@[]];
 
+  BOOL singlePermission = requests.size() == 1;
+
   // Create one button to use as a guide for the permissions' y-offsets.
   base::scoped_nsobject<NSView> allowOrOkButton;
-  if (customizationMode) {
+  if (singlePermission) {
+    NSString* allowTitle = l10n_util::GetNSString(IDS_PERMISSION_ALLOW);
+    allowOrOkButton.reset([[self buttonWithTitle:allowTitle
+                                          action:@selector(onAllow:)] retain]);
+  } else {
     NSString* okTitle = l10n_util::GetNSString(IDS_OK);
     allowOrOkButton.reset([[self buttonWithTitle:okTitle
                                           action:@selector(ok:)] retain]);
-  } else {
-    NSString* allowTitle = l10n_util::GetNSString(IDS_PERMISSION_ALLOW);
-    allowOrOkButton.reset([[self buttonWithTitle:allowTitle
-                                          action:@selector(onAllow:)] retain]);
   }
   CGFloat yOffset = 2 * kVerticalPadding + NSMaxY([allowOrOkButton frame]);
-  BOOL singlePermission = requests.size() == 1;
 
   base::scoped_nsobject<NSMutableArray> permissionMenus;
-  if (customizationMode)
+  if (!singlePermission)
     permissionMenus.reset([[NSMutableArray alloc] init]);
 
   CGFloat maxPermissionLineWidth = 0;
   for (auto it = requests.begin(); it != requests.end(); it++) {
     base::scoped_nsobject<NSView> permissionView(
         [[self labelForRequest:(*it)] retain]);
     NSPoint origin = [permissionView frame].origin;
     origin.x += kHorizontalPadding;
     origin.y += yOffset;
     [permissionView setFrameOrigin:origin];
     [contentView addSubview:permissionView];
 
-    if (customizationMode) {
+    if (!singlePermission) {
       int index = it - requests.begin();
       base::scoped_nsobject<NSView> menu(
           [[self menuForRequest:(*it)
                         atIndex:index
                           allow:acceptStates[index] ? YES : NO] retain]);
       // Align vertically.  Horizontal alignment will be adjusted once the
       // widest permission is know.
       [PermissionBubbleController alignCenterOf:menu
                            verticallyToCenterOf:permissionView];
       [permissionMenus addObject:menu];
@@ skipping 16 matching lines @@
 
   // Determine the dimensions of the bubble.
   // Once the height and width are set, the buttons and permission menus can
   // be laid out correctly.
   NSRect bubbleFrame = NSMakeRect(0, 0, kBubbleMinWidth, 0);
 
   // Fix the height of the bubble relative to the title.
   bubbleFrame.size.height = NSMaxY([titleView frame]) + kVerticalPadding +
                             info_bubble::kBubbleArrowHeight;
 
-  if (customizationMode) {
+  if (!singlePermission) {
     // Add the maximum menu width to the bubble width.
     CGFloat maxMenuWidth = 0;
     for (AllowBlockMenuButton* button in permissionMenus.get()) {
       maxMenuWidth = std::max(maxMenuWidth, [button maximumTitleWidth]);
     }
     maxPermissionLineWidth += maxMenuWidth;
   }
 
   // The title and 'x' button row must fit within the bubble.
   CGFloat titleRowWidth = NSMaxX([titleView frame]) +
@@ skipping 17 matching lines @@
 
   [closeButton setFrameOrigin:closeButtonOrigin];
   [contentView addSubview:closeButton];
 
   // Position the allow/ok button.
   CGFloat xOrigin = NSWidth(bubbleFrame) - NSWidth([allowOrOkButton frame]) -
                     kButtonRightEdgePadding;
   [allowOrOkButton setFrameOrigin:NSMakePoint(xOrigin, kVerticalPadding)];
   [contentView addSubview:allowOrOkButton];
 
-  if (customizationMode) {
-    // Adjust the horizontal origin for each menu so that its right edge
-    // lines up with the right edge of the ok button.
-    CGFloat rightEdge = NSMaxX([allowOrOkButton frame]);
-    for (NSView* view in permissionMenus.get()) {
-      [view setFrameOrigin:NSMakePoint(rightEdge - NSWidth([view frame]),
-                                       NSMinY([view frame]))];
-    }
-  } else {
+  if (singlePermission) {
     base::scoped_nsobject<NSView> blockButton;
-    if (singlePermission)
-      blockButton.reset([[self blockButton] retain]);
-    else
-      blockButton.reset([[self blockButtonWithCustomizeMenu] retain]);
+    blockButton.reset([[self blockButton] retain]);
     CGFloat width = [PermissionBubbleController matchWidthsOf:blockButton
                                                         andOf:allowOrOkButton];
     // Ensure the allow/ok button is still in the correct position.
     xOrigin = NSWidth(bubbleFrame) - width - kHorizontalPadding;
     [allowOrOkButton setFrameOrigin:NSMakePoint(xOrigin, kVerticalPadding)];
     // Line up the block button.
     xOrigin = NSMinX([allowOrOkButton frame]) - width - kBetweenButtonsPadding;
     [blockButton setFrameOrigin:NSMakePoint(xOrigin, kVerticalPadding)];
     [contentView addSubview:blockButton];
+  } else {
+    // Adjust the horizontal origin for each menu so that its right edge
+    // lines up with the right edge of the ok button.
+    CGFloat rightEdge = NSMaxX([allowOrOkButton frame]);
+    for (NSView* view in permissionMenus.get()) {
+      [view setFrameOrigin:NSMakePoint(rightEdge - NSWidth([view frame]),
+                                       NSMinY([view frame]))];
+    }
   }
 
   bubbleFrame = [[self window] frameRectForContentRect:bubbleFrame];
   if ([[self window] isVisible]) {
     // Unfortunately, calling -setFrame followed by -setFrameOrigin  (called
     // within -setAnchorPoint) causes flickering.  Avoid the flickering by
     // manually adjusting the new frame's origin so that the top left stays the
     // same, and only calling -setFrame.
     NSRect currentWindowFrame = [[self window] frame];
     bubbleFrame.origin = currentWindowFrame.origin;
@@ skipping 95 matching lines @@
   [button sizeToFit];
   return button.autorelease();
 }
 
 - (NSView*)blockButton {
   NSString* blockTitle = l10n_util::GetNSString(IDS_PERMISSION_DENY);
   return [self buttonWithTitle:blockTitle
                         action:@selector(onBlock:)];
 }
 
-- (NSView*)blockButtonWithCustomizeMenu {
-  menuDelegate_.reset(new MenuDelegate(self));
-  base::scoped_nsobject<SplitBlockButton> blockButton([[SplitBlockButton alloc]
-      initWithMenuDelegate:menuDelegate_.get()]);
-  [blockButton sizeToFit];
-  [blockButton setEnabled:YES];
-  [blockButton setAction:@selector(onBlock:)];
-  [blockButton setTarget:self];
-  return blockButton.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();
 }
 
@@ skipping 10 matching lines @@
 - (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)onMenuItemClicked:(int)commandId {
-  DCHECK(commandId == 0);
-  [self onCustomize:nil];
-}
-
 - (void)activateTabWithContents:(content::WebContents*)newContents
                previousContents:(content::WebContents*)oldContents
                         atIndex:(NSInteger)index
                          reason:(int)reason {
   // The show/hide of this bubble is handled by the PermissionBubbleManager.
   // So bypass the base class, which would close the bubble here.
 }
 
 + (CGFloat)matchWidthsOf:(NSView*)viewA andOf:(NSView*)viewB {
   NSRect frameA = [viewA frame];
   NSRect frameB = [viewB frame];
   CGFloat width = std::max(NSWidth(frameA), NSWidth(frameB));
   [viewA setFrameSize:NSMakeSize(width, NSHeight(frameA))];
   [viewB setFrameSize:NSMakeSize(width, NSHeight(frameB))];
   return width;
 }
 
 + (void)alignCenterOf:(NSView*)viewA verticallyToCenterOf:(NSView*)viewB {
   NSRect frameA = [viewA frame];
   NSRect frameB = [viewB frame];
   frameA.origin.y =
       NSMinY(frameB) + std::floor((NSHeight(frameB) - NSHeight(frameA)) / 2);
   [viewA setFrameOrigin:frameA.origin];
 }
 
 @end  // implementation PermissionBubbleController