Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1225)

Unified Diff: ui/message_center/views/message_center_button_bar.cc

Issue 2618383004: Revert of Move more vector icons to respective directories and update code to (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/vector_icons/window_control_right_snapped.1x.icon ('k') | ui/views/controls/button/image_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/views/message_center_button_bar.cc
diff --git a/ui/message_center/views/message_center_button_bar.cc b/ui/message_center/views/message_center_button_bar.cc
index 5f89a6a5a28e4363245b09665a68649a96d3e626..fb86d939ed5e603b0eb503e451e66b2c99a7bf10 100644
--- a/ui/message_center/views/message_center_button_bar.cc
+++ b/ui/message_center/views/message_center_button_bar.cc
@@ -68,9 +68,9 @@
int text_id)
: views::ToggleImageButton(listener), size_(kButtonSize, kButtonSize) {
ui::ResourceBundle& resource_bundle = ui::ResourceBundle::GetSharedInstance();
- SetImage(STATE_NORMAL, *resource_bundle.GetImageSkiaNamed(normal_id));
- SetImage(STATE_HOVERED, *resource_bundle.GetImageSkiaNamed(hover_id));
- SetImage(STATE_PRESSED, *resource_bundle.GetImageSkiaNamed(pressed_id));
+ SetImage(STATE_NORMAL, resource_bundle.GetImageSkiaNamed(normal_id));
+ SetImage(STATE_HOVERED, resource_bundle.GetImageSkiaNamed(hover_id));
+ SetImage(STATE_PRESSED, resource_bundle.GetImageSkiaNamed(pressed_id));
SetImageAlignment(views::ImageButton::ALIGN_CENTER,
views::ImageButton::ALIGN_MIDDLE);
if (text_id)
@@ -159,7 +159,7 @@
IDS_MESSAGE_CENTER_CLEAR_ALL);
close_all_button_->SetImage(
views::Button::STATE_DISABLED,
- *resource_bundle.GetImageSkiaNamed(IDR_NOTIFICATION_CLEAR_ALL_DISABLED));
+ resource_bundle.GetImageSkiaNamed(IDR_NOTIFICATION_CLEAR_ALL_DISABLED));
button_container_->AddChildView(close_all_button_);
settings_button_ =
« no previous file with comments | « ui/gfx/vector_icons/window_control_right_snapped.1x.icon ('k') | ui/views/controls/button/image_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698