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

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

Issue 318173002: Fix the notification center label. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Notification Center Title: Set in ctor. Created 6 years, 6 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 | Annotate | Revision Log
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/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 kAnimateClearingNextNotificationDelayMS)); 526 kAnimateClearingNextNotificationDelayMS));
527 } 527 }
528 } 528 }
529 529
530 // MessageCenterView /////////////////////////////////////////////////////////// 530 // MessageCenterView ///////////////////////////////////////////////////////////
531 531
532 MessageCenterView::MessageCenterView(MessageCenter* message_center, 532 MessageCenterView::MessageCenterView(MessageCenter* message_center,
533 MessageCenterTray* tray, 533 MessageCenterTray* tray,
534 int max_height, 534 int max_height,
535 bool initially_settings_visible, 535 bool initially_settings_visible,
536 bool top_down) 536 bool top_down,
537 const base::string16& title)
537 : message_center_(message_center), 538 : message_center_(message_center),
538 tray_(tray), 539 tray_(tray),
539 scroller_(NULL), 540 scroller_(NULL),
540 settings_view_(NULL), 541 settings_view_(NULL),
541 button_bar_(NULL), 542 button_bar_(NULL),
542 top_down_(top_down), 543 top_down_(top_down),
543 settings_visible_(initially_settings_visible), 544 settings_visible_(initially_settings_visible),
544 source_view_(NULL), 545 source_view_(NULL),
545 source_height_(0), 546 source_height_(0),
546 target_view_(NULL), 547 target_view_(NULL),
547 target_height_(0), 548 target_height_(0),
548 is_closing_(false), 549 is_closing_(false),
549 context_menu_controller_(new MessageViewContextMenuController(this)) { 550 context_menu_controller_(new MessageViewContextMenuController(this)) {
550 message_center_->AddObserver(this); 551 message_center_->AddObserver(this);
551 set_notify_enter_exit_on_child(true); 552 set_notify_enter_exit_on_child(true);
552 set_background(views::Background::CreateSolidBackground( 553 set_background(views::Background::CreateSolidBackground(
553 kMessageCenterBackgroundColor)); 554 kMessageCenterBackgroundColor));
554 555
555 NotifierSettingsProvider* notifier_settings_provider = 556 NotifierSettingsProvider* notifier_settings_provider =
556 message_center_->GetNotifierSettingsProvider(); 557 message_center_->GetNotifierSettingsProvider();
557 button_bar_ = new MessageCenterButtonBar(this, 558 button_bar_ = new MessageCenterButtonBar(this,
558 message_center, 559 message_center,
559 notifier_settings_provider, 560 notifier_settings_provider,
560 initially_settings_visible); 561 initially_settings_visible,
562 title);
561 563
562 const int button_height = button_bar_->GetPreferredSize().height(); 564 const int button_height = button_bar_->GetPreferredSize().height();
563 565
564 scroller_ = new views::ScrollView(); 566 scroller_ = new views::ScrollView();
565 scroller_->ClipHeightTo(kMinScrollViewHeight, max_height - button_height); 567 scroller_->ClipHeightTo(kMinScrollViewHeight, max_height - button_height);
566 scroller_->SetVerticalScrollBar(new views::OverlayScrollBar(false)); 568 scroller_->SetVerticalScrollBar(new views::OverlayScrollBar(false));
567 scroller_->set_background( 569 scroller_->set_background(
568 views::Background::CreateSolidBackground(kMessageCenterBackgroundColor)); 570 views::Background::CreateSolidBackground(kMessageCenterBackgroundColor));
569 571
570 scroller_->SetPaintToLayer(true); 572 scroller_->SetPaintToLayer(true);
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
994 scroller_->InvalidateLayout(); 996 scroller_->InvalidateLayout();
995 PreferredSizeChanged(); 997 PreferredSizeChanged();
996 Layout(); 998 Layout();
997 } 999 }
998 1000
999 void MessageCenterView::SetNotificationViewForTest(MessageView* view) { 1001 void MessageCenterView::SetNotificationViewForTest(MessageView* view) {
1000 message_list_view_->AddNotificationAt(view, 0); 1002 message_list_view_->AddNotificationAt(view, 0);
1001 } 1003 }
1002 1004
1003 } // namespace message_center 1005 } // namespace message_center
OLDNEW
« no previous file with comments | « ui/message_center/views/message_center_view.h ('k') | ui/message_center/views/message_center_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698