Chromium Code Reviews| 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/resource/resource_bundle.h" | 9 #include "ui/base/resource/resource_bundle.h" |
| 10 #include "ui/resources/grit/ui_resources.h" | 10 #include "ui/resources/grit/ui_resources.h" |
| 11 #include "ui/views/controls/button/image_button.h" | 11 #include "ui/views/controls/button/image_button.h" |
| 12 #include "ui/views/controls/image_view.h" | 12 #include "ui/views/controls/image_view.h" |
| 13 #include "ui/views/controls/label.h" | 13 #include "ui/views/controls/label.h" |
| 14 #include "ui/views/layout/grid_layout.h" | 14 #include "ui/views/layout/grid_layout.h" |
| 15 | 15 |
| 16 ChosenObjectView::ChosenObjectView( | 16 ChosenObjectRow::ChosenObjectRow( |
| 17 std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo> info) | 17 std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo> info) |
| 18 : info_(std::move(info)) { | 18 : info_(std::move(info)) { |
| 19 views::GridLayout* layout = new views::GridLayout(this); | 19 views::GridLayout* layout = new views::GridLayout(this); |
| 20 SetLayoutManager(layout); | 20 SetLayoutManager(layout); |
| 21 const int column_set_id = 0; | 21 const int column_set_id = 0; |
| 22 views::ColumnSet* column_set = layout->AddColumnSet(column_set_id); | 22 views::ColumnSet* column_set = layout->AddColumnSet(column_set_id); |
| 23 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1, | 23 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1, |
| 24 views::GridLayout::FIXED, kPermissionIconColumnWidth, | 24 views::GridLayout::FIXED, kPermissionIconColumnWidth, |
| 25 0); | 25 0); |
| 26 column_set->AddPaddingColumn(0, kPermissionIconMarginLeft); | 26 column_set->AddPaddingColumn(0, kPermissionIconMarginLeft); |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 53 delete_button_->SetImage(views::ImageButton::STATE_NORMAL, | 53 delete_button_->SetImage(views::ImageButton::STATE_NORMAL, |
| 54 rb.GetImageSkiaNamed(IDR_CLOSE_2)); | 54 rb.GetImageSkiaNamed(IDR_CLOSE_2)); |
| 55 delete_button_->SetImage(views::ImageButton::STATE_HOVERED, | 55 delete_button_->SetImage(views::ImageButton::STATE_HOVERED, |
| 56 rb.GetImageSkiaNamed(IDR_CLOSE_2_H)); | 56 rb.GetImageSkiaNamed(IDR_CLOSE_2_H)); |
| 57 delete_button_->SetImage(views::ImageButton::STATE_PRESSED, | 57 delete_button_->SetImage(views::ImageButton::STATE_PRESSED, |
| 58 rb.GetImageSkiaNamed(IDR_CLOSE_2_P)); | 58 rb.GetImageSkiaNamed(IDR_CLOSE_2_P)); |
| 59 layout->AddView(delete_button_, 1, 1, views::GridLayout::LEADING, | 59 layout->AddView(delete_button_, 1, 1, views::GridLayout::LEADING, |
| 60 views::GridLayout::CENTER); | 60 views::GridLayout::CENTER); |
| 61 } | 61 } |
| 62 | 62 |
| 63 void ChosenObjectView::AddObserver(ChosenObjectViewObserver* observer) { | 63 void ChosenObjectRow::AddObserver(ChosenObjectRowObserver* observer) { |
| 64 observer_list_.AddObserver(observer); | 64 observer_list_.AddObserver(observer); |
| 65 } | 65 } |
| 66 | 66 |
| 67 ChosenObjectView::~ChosenObjectView() {} | 67 ChosenObjectRow::~ChosenObjectRow() {} |
| 68 | 68 |
| 69 void ChosenObjectView::ButtonPressed(views::Button* sender, | 69 void ChosenObjectRow::ButtonPressed(views::Button* sender, |
| 70 const ui::Event& event) { | 70 const ui::Event& event) { |
|
msw
2016/09/01 01:42:07
nit: git cl format
lgarron
2016/09/02 02:56:48
Done.
| |
| 71 // Change the icon to reflect the selected setting. | 71 // Change the icon to reflect the selected setting. |
| 72 const gfx::Image& image = | 72 const gfx::Image& image = |
| 73 WebsiteSettingsUI::GetChosenObjectIcon(*info_, true); | 73 WebsiteSettingsUI::GetChosenObjectIcon(*info_, true); |
| 74 icon_->SetImage(image.ToImageSkia()); | 74 icon_->SetImage(image.ToImageSkia()); |
| 75 | 75 |
| 76 RemoveChildView(delete_button_); | 76 RemoveChildView(delete_button_); |
| 77 delete delete_button_; | 77 delete delete_button_; |
| 78 delete_button_ = nullptr; | 78 delete_button_ = nullptr; |
| 79 | 79 |
| 80 FOR_EACH_OBSERVER(ChosenObjectViewObserver, observer_list_, | 80 FOR_EACH_OBSERVER(ChosenObjectRowObserver, observer_list_, |
| 81 OnChosenObjectDeleted(*info_)); | 81 OnChosenObjectDeleted(*info_)); |
| 82 } | 82 } |
| OLD | NEW |