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_view.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_view_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" |
(...skipping 27 matching lines...) Expand all Loading... |
38 layout->AddView(icon_, 1, 1, views::GridLayout::CENTER, | 38 layout->AddView(icon_, 1, 1, views::GridLayout::CENTER, |
39 views::GridLayout::CENTER); | 39 views::GridLayout::CENTER); |
40 // Create the label that displays the permission type. | 40 // Create the label that displays the permission type. |
41 views::Label* label = new views::Label(l10n_util::GetStringFUTF16( | 41 views::Label* label = new views::Label(l10n_util::GetStringFUTF16( |
42 info_->ui_info.label_string_id, | 42 info_->ui_info.label_string_id, |
43 WebsiteSettingsUI::ChosenObjectToUIString(*info_))); | 43 WebsiteSettingsUI::ChosenObjectToUIString(*info_))); |
44 layout->AddView(label, 1, 1, views::GridLayout::LEADING, | 44 layout->AddView(label, 1, 1, views::GridLayout::LEADING, |
45 views::GridLayout::CENTER); | 45 views::GridLayout::CENTER); |
46 // Create the delete button. | 46 // Create the delete button. |
47 delete_button_ = new views::ImageButton(this); | 47 delete_button_ = new views::ImageButton(this); |
48 delete_button_->SetFocusBehavior(FocusBehavior::ALWAYS); | 48 views::Button::ConfigureDefaultFocus(delete_button_); |
49 delete_button_->SetTooltipText( | 49 delete_button_->SetTooltipText( |
50 l10n_util::GetStringUTF16(info_->ui_info.delete_tooltip_string_id)); | 50 l10n_util::GetStringUTF16(info_->ui_info.delete_tooltip_string_id)); |
51 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); | 51 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
52 delete_button_->SetImage(views::ImageButton::STATE_NORMAL, | 52 delete_button_->SetImage(views::ImageButton::STATE_NORMAL, |
53 rb.GetImageSkiaNamed(IDR_CLOSE_2)); | 53 rb.GetImageSkiaNamed(IDR_CLOSE_2)); |
54 delete_button_->SetImage(views::ImageButton::STATE_HOVERED, | 54 delete_button_->SetImage(views::ImageButton::STATE_HOVERED, |
55 rb.GetImageSkiaNamed(IDR_CLOSE_2_H)); | 55 rb.GetImageSkiaNamed(IDR_CLOSE_2_H)); |
56 delete_button_->SetImage(views::ImageButton::STATE_PRESSED, | 56 delete_button_->SetImage(views::ImageButton::STATE_PRESSED, |
57 rb.GetImageSkiaNamed(IDR_CLOSE_2_P)); | 57 rb.GetImageSkiaNamed(IDR_CLOSE_2_P)); |
58 layout->AddView(delete_button_, 1, 1, views::GridLayout::LEADING, | 58 layout->AddView(delete_button_, 1, 1, views::GridLayout::LEADING, |
(...skipping 13 matching lines...) Expand all Loading... |
72 WebsiteSettingsUI::GetChosenObjectIcon(*info_, true); | 72 WebsiteSettingsUI::GetChosenObjectIcon(*info_, true); |
73 icon_->SetImage(image.ToImageSkia()); | 73 icon_->SetImage(image.ToImageSkia()); |
74 | 74 |
75 RemoveChildView(delete_button_); | 75 RemoveChildView(delete_button_); |
76 delete delete_button_; | 76 delete delete_button_; |
77 delete_button_ = nullptr; | 77 delete_button_ = nullptr; |
78 | 78 |
79 FOR_EACH_OBSERVER(ChosenObjectViewObserver, observer_list_, | 79 FOR_EACH_OBSERVER(ChosenObjectViewObserver, observer_list_, |
80 OnChosenObjectDeleted(*info_)); | 80 OnChosenObjectDeleted(*info_)); |
81 } | 81 } |
OLD | NEW |