OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "ui/message_center/views/message_center_view.h" | 5 #include "ui/message_center/views/message_center_view.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 | 8 |
9 #include "grit/ui_strings.h" | 9 #include "grit/ui_strings.h" |
10 #include "ui/base/l10n/l10n_util.h" | 10 #include "ui/base/l10n/l10n_util.h" |
11 #include "ui/base/resource/resource_bundle.h" | 11 #include "ui/base/resource/resource_bundle.h" |
12 #include "ui/gfx/canvas.h" | 12 #include "ui/gfx/canvas.h" |
13 #include "ui/gfx/insets.h" | 13 #include "ui/gfx/insets.h" |
14 #include "ui/gfx/point.h" | 14 #include "ui/gfx/point.h" |
15 #include "ui/gfx/rect.h" | 15 #include "ui/gfx/rect.h" |
16 #include "ui/gfx/size.h" | 16 #include "ui/gfx/size.h" |
17 #include "ui/gfx/text_constants.h" | 17 #include "ui/gfx/text_constants.h" |
18 #include "ui/message_center/message_center_constants.h" | 18 #include "ui/message_center/message_center_constants.h" |
19 #include "ui/message_center/message_center_util.h" | 19 #include "ui/message_center/message_center_util.h" |
20 #include "ui/message_center/notification_change_observer.h" | 20 #include "ui/message_center/notification_change_observer.h" |
21 #include "ui/message_center/views/message_view.h" | 21 #include "ui/message_center/views/message_view.h" |
22 #include "ui/message_center/views/notification_view.h" | 22 #include "ui/message_center/views/notification_view.h" |
23 #include "ui/views/background.h" | 23 #include "ui/views/background.h" |
24 #include "ui/views/border.h" | 24 #include "ui/views/border.h" |
25 #include "ui/views/controls/button/button.h" | 25 #include "ui/views/controls/button/button.h" |
| 26 #include "ui/views/controls/button/label_button.h" |
26 #include "ui/views/controls/button/text_button.h" | 27 #include "ui/views/controls/button/text_button.h" |
27 #include "ui/views/controls/label.h" | 28 #include "ui/views/controls/label.h" |
28 #include "ui/views/controls/scroll_view.h" | 29 #include "ui/views/controls/scroll_view.h" |
29 #include "ui/views/controls/scrollbar/kennedy_scroll_bar.h" | 30 #include "ui/views/controls/scrollbar/kennedy_scroll_bar.h" |
30 #include "ui/views/layout/box_layout.h" | 31 #include "ui/views/layout/box_layout.h" |
31 #include "ui/views/layout/grid_layout.h" | 32 #include "ui/views/layout/grid_layout.h" |
32 #include "ui/views/painter.h" | 33 #include "ui/views/painter.h" |
33 #include "ui/views/widget/widget.h" | 34 #include "ui/views/widget/widget.h" |
34 | 35 |
35 | 36 |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 views::GridLayout* layout = new views::GridLayout(this); | 82 views::GridLayout* layout = new views::GridLayout(this); |
82 SetLayoutManager(layout); | 83 SetLayoutManager(layout); |
83 views::ColumnSet* columns = layout->AddColumnSet(0); | 84 views::ColumnSet* columns = layout->AddColumnSet(0); |
84 columns->AddPaddingColumn(100, 0); | 85 columns->AddPaddingColumn(100, 0); |
85 columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER, | 86 columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER, |
86 0, /* resize percent */ | 87 0, /* resize percent */ |
87 views::GridLayout::USE_PREF, 0, 0); | 88 views::GridLayout::USE_PREF, 0, 0); |
88 columns->AddPaddingColumn(0, 4); | 89 columns->AddPaddingColumn(0, 4); |
89 | 90 |
90 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); | 91 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
91 views::TextButton* close_all_button = new views::TextButton( | 92 views::LabelButton* close_all_button = new views::LabelButton( |
92 this, rb.GetLocalizedString(IDS_MESSAGE_CENTER_CLEAR_ALL)); | 93 this, rb.GetLocalizedString(IDS_MESSAGE_CENTER_CLEAR_ALL)); |
93 close_all_button->set_alignment(views::TextButton::ALIGN_CENTER); | 94 close_all_button->SetHorizontalAlignment(gfx::ALIGN_CENTER); |
94 close_all_button->set_request_focus_on_press(false); | 95 close_all_button->set_request_focus_on_press(false); |
95 | 96 |
96 layout->AddPaddingRow(0, 4); | 97 layout->AddPaddingRow(0, 4); |
97 layout->StartRow(0, 0); | 98 layout->StartRow(0, 0); |
98 layout->AddView(close_all_button); | 99 layout->AddView(close_all_button); |
99 set_close_all_button(close_all_button); | 100 set_close_all_button(close_all_button); |
100 } | 101 } |
101 | 102 |
102 void PoorMessageCenterButtonBar::ButtonPressed(views::Button* sender, | 103 void PoorMessageCenterButtonBar::ButtonPressed(views::Button* sender, |
103 const ui::Event& event) { | 104 const ui::Event& event) { |
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
449 void MessageCenterView::AddNotification(const Notification& notification) { | 450 void MessageCenterView::AddNotification(const Notification& notification) { |
450 // NotificationViews are expanded by default here until | 451 // NotificationViews are expanded by default here until |
451 // http://crbug.com/217902 is fixed. TODO(dharcourt): Fix. | 452 // http://crbug.com/217902 is fixed. TODO(dharcourt): Fix. |
452 MessageView* view = NotificationView::Create(notification, observer_, true); | 453 MessageView* view = NotificationView::Create(notification, observer_, true); |
453 view->set_scroller(scroller_); | 454 view->set_scroller(scroller_); |
454 message_views_[notification.id()] = view; | 455 message_views_[notification.id()] = view; |
455 message_list_view_->AddChildView(view); | 456 message_list_view_->AddChildView(view); |
456 } | 457 } |
457 | 458 |
458 } // namespace message_center | 459 } // namespace message_center |
OLD | NEW |