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

Side by Side Diff: ui/message_center/views/message_center_view.cc

Issue 1979583003: Support notifications with custom content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@messageview-close-button
Patch Set: fix mac build, attempt 2 Created 4 years, 7 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 unified diff | Download patch
OLDNEW
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 <list> 7 #include <list>
8 #include <map> 8 #include <map>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/stl_util.h" 13 #include "base/stl_util.h"
14 #include "build/build_config.h" 14 #include "build/build_config.h"
15 #include "ui/base/l10n/l10n_util.h" 15 #include "ui/base/l10n/l10n_util.h"
16 #include "ui/gfx/animation/multi_animation.h" 16 #include "ui/gfx/animation/multi_animation.h"
17 #include "ui/gfx/canvas.h" 17 #include "ui/gfx/canvas.h"
18 #include "ui/gfx/geometry/insets.h" 18 #include "ui/gfx/geometry/insets.h"
19 #include "ui/gfx/geometry/rect.h" 19 #include "ui/gfx/geometry/rect.h"
20 #include "ui/gfx/geometry/size.h" 20 #include "ui/gfx/geometry/size.h"
21 #include "ui/message_center/message_center.h" 21 #include "ui/message_center/message_center.h"
22 #include "ui/message_center/message_center_style.h" 22 #include "ui/message_center/message_center_style.h"
23 #include "ui/message_center/message_center_tray.h" 23 #include "ui/message_center/message_center_tray.h"
24 #include "ui/message_center/message_center_types.h" 24 #include "ui/message_center/message_center_types.h"
25 #include "ui/message_center/views/message_center_button_bar.h" 25 #include "ui/message_center/views/message_center_button_bar.h"
26 #include "ui/message_center/views/message_list_view.h" 26 #include "ui/message_center/views/message_list_view.h"
27 #include "ui/message_center/views/message_view.h" 27 #include "ui/message_center/views/message_view.h"
28 #include "ui/message_center/views/message_view_context_menu_controller.h" 28 #include "ui/message_center/views/message_view_context_menu_controller.h"
29 #include "ui/message_center/views/notification_view.h" 29 #include "ui/message_center/views/message_view_factory.h"
30 #include "ui/message_center/views/notifier_settings_view.h" 30 #include "ui/message_center/views/notifier_settings_view.h"
31 #include "ui/resources/grit/ui_resources.h" 31 #include "ui/resources/grit/ui_resources.h"
32 #include "ui/strings/grit/ui_strings.h" 32 #include "ui/strings/grit/ui_strings.h"
33 #include "ui/views/background.h" 33 #include "ui/views/background.h"
34 #include "ui/views/border.h" 34 #include "ui/views/border.h"
35 #include "ui/views/controls/button/button.h" 35 #include "ui/views/controls/button/button.h"
36 #include "ui/views/controls/label.h" 36 #include "ui/views/controls/label.h"
37 #include "ui/views/controls/scroll_view.h" 37 #include "ui/views/controls/scroll_view.h"
38 #include "ui/views/controls/scrollbar/overlay_scroll_bar.h" 38 #include "ui/views/controls/scrollbar/overlay_scroll_bar.h"
39 #include "ui/views/layout/fill_layout.h" 39 #include "ui/views/layout/fill_layout.h"
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 } 473 }
474 474
475 void MessageCenterView::AnimationCanceled(const gfx::Animation* animation) { 475 void MessageCenterView::AnimationCanceled(const gfx::Animation* animation) {
476 DCHECK_EQ(animation, settings_transition_animation_.get()); 476 DCHECK_EQ(animation, settings_transition_animation_.get());
477 AnimationEnded(animation); 477 AnimationEnded(animation);
478 } 478 }
479 479
480 void MessageCenterView::AddNotificationAt(const Notification& notification, 480 void MessageCenterView::AddNotificationAt(const Notification& notification,
481 int index) { 481 int index) {
482 MessageView* view = 482 MessageView* view =
483 NotificationView::Create(this, notification, false); // Not top-level. 483 MessageViewFactory::Create(this, notification, false); // Not top-level.
484 view->set_context_menu_controller(context_menu_controller_.get()); 484 view->set_context_menu_controller(context_menu_controller_.get());
485 notification_views_[notification.id()] = view; 485 notification_views_[notification.id()] = view;
486 view->set_scroller(scroller_); 486 view->set_scroller(scroller_);
487 message_list_view_->AddNotificationAt(view, index); 487 message_list_view_->AddNotificationAt(view, index);
488 } 488 }
489 489
490 base::string16 MessageCenterView::GetButtonBarTitle() const { 490 base::string16 MessageCenterView::GetButtonBarTitle() const {
491 bool no_message_views = notification_views_.empty(); 491 bool no_message_views = notification_views_.empty();
492 if (no_message_views && !settings_visible_) 492 if (no_message_views && !settings_visible_)
493 return l10n_util::GetStringUTF16(IDS_MESSAGE_CENTER_NO_MESSAGES); 493 return l10n_util::GetStringUTF16(IDS_MESSAGE_CENTER_NO_MESSAGES);
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 // Disable the close-all button since no notification is visible. 619 // Disable the close-all button since no notification is visible.
620 button_bar_->SetCloseAllButtonEnabled(false); 620 button_bar_->SetCloseAllButtonEnabled(false);
621 } 621 }
622 } 622 }
623 623
624 void MessageCenterView::SetNotificationViewForTest(MessageView* view) { 624 void MessageCenterView::SetNotificationViewForTest(MessageView* view) {
625 message_list_view_->AddNotificationAt(view, 0); 625 message_list_view_->AddNotificationAt(view, 0);
626 } 626 }
627 627
628 } // namespace message_center 628 } // namespace message_center
OLDNEW
« no previous file with comments | « ui/message_center/views/custom_notification_view_unittest.cc ('k') | ui/message_center/views/message_popup_collection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698