Use same base class for popup and plugin blocking UI

chrome/browser/ui/views/content_setting_bubble_contents.cc

 // 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.
 
 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 193 matching lines @@
 
   if (!bubble_content.learn_more_link.empty()) {
     learn_more_link_ =
         new views::Link(base::UTF8ToUTF16(bubble_content.learn_more_link));
     learn_more_link_->set_listener(this);
     learn_more_link_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     layout->AddView(learn_more_link_);
     bubble_content_empty = false;
   }
 
-  if (!bubble_content.plugin_names.empty()) {
-    const int kPluginsColumnSetId = 4;
-    layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
-    views::ColumnSet* plugins_column_set =
-        layout->AddColumnSet(kPluginsColumnSetId);
-    plugins_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
-                                  GridLayout::USE_PREF, 0, 0);
-    plugins_column_set->AddPaddingColumn(
+  // Layout for the item list (blocked plugins and popups).
+  if (!bubble_content.list_items.empty()) {
+    const int kItemListColumnSetId = 2;
+    views::ColumnSet* item_list_column_set =
+        layout->AddColumnSet(kItemListColumnSetId);
+    item_list_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 0,
+                                    GridLayout::USE_PREF, 0, 0);
+    item_list_column_set->AddPaddingColumn(
         0, views::kRelatedControlHorizontalSpacing);
-    plugins_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
-                                  GridLayout::USE_PREF, 0, 0);
+    item_list_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
+                                    GridLayout::USE_PREF, 0, 0);
 
-    views::Label* plugin_names_label =
-        new views::Label(bubble_content.plugin_names);
-    plugin_names_label->SetMultiLine(true);
-    plugin_names_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    layout->StartRow(0, kPluginsColumnSetId);
-    layout->AddView(plugin_names_label);
-    bubble_content_empty = false;
-  }
-
-  if (content_setting_bubble_model_->content_type() ==
-      CONTENT_SETTINGS_TYPE_POPUPS) {
-    const int kPopupColumnSetId = 2;
-    views::ColumnSet* popup_column_set =
-        layout->AddColumnSet(kPopupColumnSetId);
-    popup_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 0,
-                                GridLayout::USE_PREF, 0, 0);
-    popup_column_set->AddPaddingColumn(
-        0, views::kRelatedControlHorizontalSpacing);
-    popup_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
-                                GridLayout::USE_PREF, 0, 0);
-
-    for (std::vector<ContentSettingBubbleModel::PopupItem>::const_iterator
-         i(bubble_content.popup_items.begin());
-         i != bubble_content.popup_items.end(); ++i) {
+    int row = 0;
+    for (const auto& list_item : bubble_content.list_items) {
       if (!bubble_content_empty)
         layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
-      layout->StartRow(0, kPopupColumnSetId);
-
-      views::Link* link = new views::Link(base::UTF8ToUTF16(i->title));
-      link->set_listener(this);
-      link->SetElideBehavior(gfx::ELIDE_MIDDLE);
-      popup_links_[link] = i - bubble_content.popup_items.begin();
-      layout->AddView(new Favicon(i->image, this, link));
-      layout->AddView(link);
+      layout->StartRow(0, kItemListColumnSetId);
+      if (list_item.has_link) {
+        views::Link* link = new views::Link(base::UTF8ToUTF16(list_item.title));
+        link->set_listener(this);
+        link->SetElideBehavior(gfx::ELIDE_MIDDLE);
+        list_item_links_[link] = row++;

[msw, 2015/03/23 23:54:13]

Should |row| be incremented in the label case to maintain the same values and
match Cocoa's initializeItemList? (please test against regressions here!)

[meacer, 2015/03/24 00:14:39]

Good catch! It doesn't make a difference for this CL since we never match linked
and non-linked items, but fixed it anyways.

+        layout->AddView(new Favicon(list_item.image, this, link));
+        layout->AddView(link);
+      } else {
+        views::Label* label =
+            new views::Label(base::UTF8ToUTF16(list_item.title));
+        layout->AddView(new Favicon(list_item.image, this, NULL));
+        layout->AddView(label);
+      }
       bubble_content_empty = false;
     }
   }
 
   const int indented_kSingleColumnSetId = 3;
   // Insert a column set with greater indent.
   views::ColumnSet* indented_single_column_set =
       layout->AddColumnSet(indented_kSingleColumnSetId);
   indented_single_column_set->AddPaddingColumn(0, views::kCheckboxIndent);
   indented_single_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL,
@@ skipping 18 matching lines @@
     }
     DCHECK(!radio_group_.empty());
     // Now that the buttons have been added to the view hierarchy, it's safe
     // to call SetChecked() on them.
     radio_group_[radio_group.default_item]->SetChecked(true);
   }
 
   // Layout code for the media device menus.
   if (content_setting_bubble_model_->content_type() ==
       CONTENT_SETTINGS_TYPE_MEDIASTREAM) {
-    const int kMediaMenuColumnSetId = 2;
+    const int kMediaMenuColumnSetId = 4;
     views::ColumnSet* menu_column_set =
         layout->AddColumnSet(kMediaMenuColumnSetId);
     menu_column_set->AddPaddingColumn(0, views::kCheckboxIndent);
     menu_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 0,
                                GridLayout::USE_PREF, 0, 0);
     menu_column_set->AddPaddingColumn(
         0, views::kRelatedControlHorizontalSpacing);
     menu_column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 1,
                                GridLayout::USE_PREF, 0, 0);
 
@@ skipping 147 matching lines @@
     return;
   }
   if (source == manage_link_) {
     GetWidget()->Close();
     content_setting_bubble_model_->OnManageLinkClicked();
     // CAREFUL: Showing the settings window activates it, which deactivates the
     // info bubble, which causes it to close, which deletes us.
     return;
   }
 
-  PopupLinks::const_iterator i(popup_links_.find(source));
-  DCHECK(i != popup_links_.end());
-  content_setting_bubble_model_->OnPopupClicked(i->second);
+  ListItemLinks::const_iterator i(list_item_links_.find(source));
+  DCHECK(i != list_item_links_.end());
+  content_setting_bubble_model_->OnListItemClicked(i->second);
 }
 
 void ContentSettingBubbleContents::OnMenuButtonClicked(
     views::View* source,
     const gfx::Point& point) {
     MediaMenuPartsMap::iterator j(media_menus_.find(
         static_cast<views::MenuButton*>(source)));
     DCHECK(j != media_menus_.end());
     menu_runner_.reset(new views::MenuRunner(j->second->menu_model.get(),
                                              views::MenuRunner::HAS_MNEMONICS));
@@ skipping 34 matching lines @@
   // Make sure the width is at least kMinMediaMenuButtonWidth. The
   // maximum width will be clamped by kMaxContentsWidth of the view.
   menu_width = std::max(kMinMediaMenuButtonWidth, menu_width + margins);
 
   for (MediaMenuPartsMap::const_iterator i = media_menus_.begin();
        i != media_menus_.end(); ++i) {
     i->first->SetMinSize(gfx::Size(menu_width, 0));
     i->first->SetMaxSize(gfx::Size(menu_width, 0));
   }
 }