Use same base class for popup and plugin blocking UI

chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.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/content_settings/content_setting_bubble_cocoa.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 192 matching lines @@
         webContents:(content::WebContents*)webContents
        parentWindow:(NSWindow*)parentWindow
          anchoredAt:(NSPoint)anchoredAt;
 - (NSButton*)hyperlinkButtonWithFrame:(NSRect)frame
                                 title:(NSString*)title
                                  icon:(NSImage*)icon
                        referenceFrame:(NSRect)referenceFrame;
 - (void)initializeBlockedPluginsList;
 - (void)initializeTitle;
 - (void)initializeRadioGroup;
-- (void)initializePopupList;
+- (void)initializeItemList;
 - (void)initializeGeoLists;
 - (void)initializeMediaMenus;
 - (void)initializeMIDISysExLists;
 - (void)sizeToFitLoadButton;
 - (void)initManageDoneButtons;
 - (void)removeInfoButton;
 - (void)popupLinkClicked:(id)sender;
 - (void)clearGeolocationForCurrentHost:(id)sender;
 - (void)clearMIDISysExForCurrentHost:(id)sender;
 @end
@@ skipping 153 matching lines @@
   if (NSWidth(buttonFrame) > maxWidth)
     buttonFrame.size.width = maxWidth;
 
   [button setFrame:buttonFrame];
   [button setTarget:self];
   [button setAction:@selector(popupLinkClicked:)];
   return button;
 }
 
 - (void)initializeBlockedPluginsList {
-  NSString* label = base::SysUTF16ToNSString(
-      contentSettingBubbleModel_->bubble_content().plugin_names);
-  [blockedResourcesField_ setStringValue:label];
+  int delta =
+      NSMinY([titleLabel_ frame]) - NSMinY([blockedResourcesField_ frame]);
+  [blockedResourcesField_ removeFromSuperview];
+  NSRect frame = [[self window] frame];
+  frame.size.height -= delta;
+  [[self window] setFrame:frame display:NO];
 }

[meacer, 2015/03/20 19:40:04]

This is essentially a revert of
https://codereview.chromium.org/777103002/diff/180001/chrome/browser/ui/cocoa...

[msw, 2015/03/20 22:06:33]

I'm less familiar with Cocoa, can you get c/b/ui/cocoa owners review, maybe ping
groby@. You should also ask wfh@ to take a look too, or at least CC him.

 
-- (void)initializePopupList {
+- (void)initializeItemList {
   // I didn't put the buttons into a NSMatrix because then they are only one
   // entity in the key view loop. This way, one can tab through all of them.
-  const ContentSettingBubbleModel::PopupItems& popupItems =
-      contentSettingBubbleModel_->bubble_content().popup_items;
+  const ContentSettingBubbleModel::ListItems& listItems =
+      contentSettingBubbleModel_->bubble_content().list_items;
 
   // Get the pre-resize frame of the radio group. Its origin is where the
   // popup list should go.
   NSRect radioFrame = [allowBlockRadioGroup_ frame];
 
   // Make room for the popup list. The bubble view and its subviews autosize
   // themselves when the window is enlarged.
   // Heading and radio box are already 1 * kLinkOuterPadding apart in the nib,
   // so only 1 * kLinkOuterPadding more is needed.
-  int delta = popupItems.size() * kLinkLineHeight - kLinkPadding +
-              kLinkOuterPadding;
+  int delta =
+      listItems.size() * kLinkLineHeight - kLinkPadding + kLinkOuterPadding;
   NSSize deltaSize = NSMakeSize(0, delta);
   deltaSize = [[[self window] contentView] convertSize:deltaSize toView:nil];
   NSRect windowFrame = [[self window] frame];
   windowFrame.size.height += deltaSize.height;
   [[self window] setFrame:windowFrame display:NO];
 
-  // Create popup list.
+  // Create item list.
   int topLinkY = NSMaxY(radioFrame) + delta - kLinkHeight;
   int row = 0;
-  for (std::vector<ContentSettingBubbleModel::PopupItem>::const_iterator
-       it(popupItems.begin()); it != popupItems.end(); ++it, ++row) {
+  for (std::vector<ContentSettingBubbleModel::ListItem>::const_iterator
+           it(listItems.begin());
+       it != listItems.end(); ++it, ++row) {
     NSImage* image = it->image.AsNSImage();
-
-    std::string title(it->title);
-    // The popup may not have committed a load yet, in which case it won't

[msw, 2015/03/20 22:06:33]

Why did you remove this? Is this no longer an issue?

[meacer, 2015/03/20 23:39:42]

Removed from here as this check is already done at
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/ui/...
so title is never empty.

[msw, 2015/03/21 00:25:19]

Acknowledged.

-    // have a URL or title.
-    if (title.empty())
-      title = l10n_util::GetStringUTF8(IDS_TAB_LOADING_TITLE);
-
     NSRect linkFrame =
         NSMakeRect(NSMinX(radioFrame), topLinkY - kLinkLineHeight * row,
                    200, kLinkHeight);
-    NSButton* button = [self
-        hyperlinkButtonWithFrame:linkFrame
-                           title:base::SysUTF8ToNSString(title)
-                            icon:image
-                  referenceFrame:radioFrame];
+    NSButton* button =
+        [self hyperlinkButtonWithFrame:linkFrame
+                                 title:base::SysUTF8ToNSString(it->title)
+                                  icon:image
+                        referenceFrame:radioFrame];
     [[self bubble] addSubview:button];
     popupLinks_[button] = row;
   }
 }
 
 - (void)initializeGeoLists {
   // Cocoa has its origin in the lower left corner. This means elements are
   // added from bottom to top, which explains why loops run backwards and the
   // order of operations is the other way than on Linux/Windows.
   const ContentSettingBubbleModel::BubbleContent& content =
@@ skipping 296 matching lines @@
 
   ContentSettingsType type = contentSettingBubbleModel_->content_type();
   if (type == CONTENT_SETTINGS_TYPE_PLUGINS) {
     [self sizeToFitLoadButton];
     [self initializeBlockedPluginsList];
   }
 
   if (allowBlockRadioGroup_)  // not bound in cookie bubble xib
     [self initializeRadioGroup];
 
-  if (type == CONTENT_SETTINGS_TYPE_POPUPS)
-    [self initializePopupList];
+  if (type == CONTENT_SETTINGS_TYPE_POPUPS ||
+      type == CONTENT_SETTINGS_TYPE_PLUGINS)
+    [self initializeItemList];
   if (type == CONTENT_SETTINGS_TYPE_GEOLOCATION)
     [self initializeGeoLists];
   if (type == CONTENT_SETTINGS_TYPE_MEDIASTREAM)
     [self initializeMediaMenus];
   if (type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX)
     [self initializeMIDISysExLists];
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Actual application logic
 
 - (IBAction)allowBlockToggled:(id)sender {
   NSButtonCell *selectedCell = [sender selectedCell];
   contentSettingBubbleModel_->OnRadioClicked([selectedCell tag] - 1);
 }
 
 - (void)popupLinkClicked:(id)sender {
   content_setting_bubble::PopupLinks::iterator i(popupLinks_.find(sender));
   DCHECK(i != popupLinks_.end());
-  contentSettingBubbleModel_->OnPopupClicked(i->second);
+  contentSettingBubbleModel_->OnListItemClicked(i->second);
 }
 
 - (void)clearGeolocationForCurrentHost:(id)sender {
   contentSettingBubbleModel_->OnCustomLinkClicked();
   [self close];
 }
 
 - (void)clearMIDISysExForCurrentHost:(id)sender {
   contentSettingBubbleModel_->OnCustomLinkClicked();
   [self close];
@@ skipping 33 matching lines @@
       button, base::SysUTF16ToNSString(it->second->model->GetLabelAt(index)));
 
   it->second->model->ExecuteCommand(index, 0);
 }
 
 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus {
   return &mediaMenus_;
 }
 
 @end  // ContentSettingBubbleController