| Index: chrome/browser/ui/views/website_settings/chosen_object_row.h
|
| diff --git a/chrome/browser/ui/views/website_settings/chosen_object_row.h b/chrome/browser/ui/views/website_settings/chosen_object_row.h
|
| index d90f2c15f14560236bb30d48a8571441aa59ad62..3e4fb66037579731ac29d63a0994ceaa412ba978 100644
|
| --- a/chrome/browser/ui/views/website_settings/chosen_object_row.h
|
| +++ b/chrome/browser/ui/views/website_settings/chosen_object_row.h
|
| @@ -8,6 +8,7 @@
|
| #include "base/macros.h"
|
| #include "chrome/browser/ui/website_settings/website_settings_ui.h"
|
| #include "ui/views/controls/button/button.h"
|
| +#include "ui/views/layout/grid_layout.h"
|
| #include "ui/views/view.h"
|
|
|
| namespace views {
|
| @@ -20,10 +21,13 @@ class ChosenObjectRowObserver;
|
| // A ChosenObjectRow is a row in the Page Info bubble that shows an individual
|
| // object (e.g. a Bluetooth device, a USB device) that the current site has
|
| // access to.
|
| -class ChosenObjectRow : public views::View, public views::ButtonListener {
|
| +class ChosenObjectRow : public views::ButtonListener {
|
| public:
|
| - explicit ChosenObjectRow(
|
| - std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo> info);
|
| + // The constructor adds two views to the current row of |layout|:
|
| + // 1. An icon.
|
| + // 2. A label with a delete button.
|
| + ChosenObjectRow(std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo> info,
|
| + views::GridLayout* layout);
|
|
|
| void AddObserver(ChosenObjectRowObserver* observer);
|
|
|
| @@ -34,6 +38,7 @@ class ChosenObjectRow : public views::View, public views::ButtonListener {
|
| void ButtonPressed(views::Button* sender, const ui::Event& event) override;
|
|
|
| views::ImageView* icon_; // Owned by the views hierarchy.
|
| + views::View* label_with_delete_; // Owned by the views hierarchy.
|
| views::ImageButton* delete_button_; // Owned by the views hierarchy.
|
|
|
| base::ObserverList<ChosenObjectRowObserver> observer_list_;
|
|
|