| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/website_settings/chosen_object_view.h" | 5 #include "chrome/browser/ui/views/website_settings/chosen_object_row.h" |
| 6 | 6 |
| 7 #include "chrome/browser/ui/views/website_settings/chosen_object_view_observer.h
" | 7 #include "chrome/browser/ui/views/website_settings/chosen_object_row_observer.h" |
| 8 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h
" | 8 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h
" |
| 9 #include "ui/base/l10n/l10n_util.h" | 9 #include "ui/base/l10n/l10n_util.h" |
| 10 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
| 11 #include "ui/resources/grit/ui_resources.h" | 11 #include "ui/resources/grit/ui_resources.h" |
| 12 #include "ui/views/controls/button/image_button.h" | 12 #include "ui/views/controls/button/image_button.h" |
| 13 #include "ui/views/controls/image_view.h" | 13 #include "ui/views/controls/image_view.h" |
| 14 #include "ui/views/controls/label.h" | 14 #include "ui/views/controls/label.h" |
| 15 #include "ui/views/layout/grid_layout.h" | 15 #include "ui/views/layout/grid_layout.h" |
| 16 | 16 |
| 17 ChosenObjectView::ChosenObjectView( | 17 ChosenObjectRow::ChosenObjectRow( |
| 18 std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo> info) | 18 std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo> info) |
| 19 : info_(std::move(info)) { | 19 : info_(std::move(info)) { |
| 20 views::GridLayout* layout = new views::GridLayout(this); | 20 views::GridLayout* layout = new views::GridLayout(this); |
| 21 SetLayoutManager(layout); | 21 SetLayoutManager(layout); |
| 22 const int column_set_id = 0; | 22 const int column_set_id = 0; |
| 23 views::ColumnSet* column_set = layout->AddColumnSet(column_set_id); | 23 views::ColumnSet* column_set = layout->AddColumnSet(column_set_id); |
| 24 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1, | 24 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1, |
| 25 views::GridLayout::FIXED, kPermissionIconColumnWidth, | 25 views::GridLayout::FIXED, kPermissionIconColumnWidth, |
| 26 0); | 26 0); |
| 27 column_set->AddPaddingColumn(0, kPermissionIconMarginLeft); | 27 column_set->AddPaddingColumn(0, kPermissionIconMarginLeft); |
| (...skipping 26 matching lines...) Expand all Loading... |
| 54 delete_button_->SetImage(views::ImageButton::STATE_NORMAL, | 54 delete_button_->SetImage(views::ImageButton::STATE_NORMAL, |
| 55 rb.GetImageSkiaNamed(IDR_CLOSE_2)); | 55 rb.GetImageSkiaNamed(IDR_CLOSE_2)); |
| 56 delete_button_->SetImage(views::ImageButton::STATE_HOVERED, | 56 delete_button_->SetImage(views::ImageButton::STATE_HOVERED, |
| 57 rb.GetImageSkiaNamed(IDR_CLOSE_2_H)); | 57 rb.GetImageSkiaNamed(IDR_CLOSE_2_H)); |
| 58 delete_button_->SetImage(views::ImageButton::STATE_PRESSED, | 58 delete_button_->SetImage(views::ImageButton::STATE_PRESSED, |
| 59 rb.GetImageSkiaNamed(IDR_CLOSE_2_P)); | 59 rb.GetImageSkiaNamed(IDR_CLOSE_2_P)); |
| 60 layout->AddView(delete_button_, 1, 1, views::GridLayout::LEADING, | 60 layout->AddView(delete_button_, 1, 1, views::GridLayout::LEADING, |
| 61 views::GridLayout::CENTER); | 61 views::GridLayout::CENTER); |
| 62 } | 62 } |
| 63 | 63 |
| 64 void ChosenObjectView::AddObserver(ChosenObjectViewObserver* observer) { | 64 void ChosenObjectRow::AddObserver(ChosenObjectRowObserver* observer) { |
| 65 observer_list_.AddObserver(observer); | 65 observer_list_.AddObserver(observer); |
| 66 } | 66 } |
| 67 | 67 |
| 68 ChosenObjectView::~ChosenObjectView() {} | 68 ChosenObjectRow::~ChosenObjectRow() {} |
| 69 | 69 |
| 70 void ChosenObjectView::ButtonPressed(views::Button* sender, | 70 void ChosenObjectRow::ButtonPressed(views::Button* sender, |
| 71 const ui::Event& event) { | 71 const ui::Event& event) { |
| 72 // Change the icon to reflect the selected setting. | 72 // Change the icon to reflect the selected setting. |
| 73 const gfx::Image& image = | 73 const gfx::Image& image = |
| 74 WebsiteSettingsUI::GetChosenObjectIcon(*info_, true); | 74 WebsiteSettingsUI::GetChosenObjectIcon(*info_, true); |
| 75 icon_->SetImage(image.ToImageSkia()); | 75 icon_->SetImage(image.ToImageSkia()); |
| 76 | 76 |
| 77 RemoveChildView(delete_button_); | 77 RemoveChildView(delete_button_); |
| 78 delete delete_button_; | 78 delete delete_button_; |
| 79 delete_button_ = nullptr; | 79 delete_button_ = nullptr; |
| 80 | 80 |
| 81 FOR_EACH_OBSERVER(ChosenObjectViewObserver, observer_list_, | 81 FOR_EACH_OBSERVER(ChosenObjectRowObserver, observer_list_, |
| 82 OnChosenObjectDeleted(*info_)); | 82 OnChosenObjectDeleted(*info_)); |
| 83 } | 83 } |
| OLD | NEW |