OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_bubble.h" | 5 #include "ui/message_center/views/message_center_bubble.h" |
6 | 6 |
7 #include "ui/message_center/message_center_style.h" | 7 #include "ui/message_center/message_center_style.h" |
8 #include "ui/message_center/views/message_center_view.h" | 8 #include "ui/message_center/views/message_center_view.h" |
9 #include "ui/views/layout/fill_layout.h" | 9 #include "ui/views/layout/fill_layout.h" |
10 #include "ui/views/widget/widget.h" | 10 #include "ui/views/widget/widget.h" |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 | 89 |
90 void MessageCenterBubble::InitializeContents( | 90 void MessageCenterBubble::InitializeContents( |
91 views::TrayBubbleView* new_bubble_view) { | 91 views::TrayBubbleView* new_bubble_view) { |
92 set_bubble_view(new_bubble_view); | 92 set_bubble_view(new_bubble_view); |
93 bubble_view()->GetWidget()->AddObserver(this); | 93 bubble_view()->GetWidget()->AddObserver(this); |
94 message_center_view_ = new MessageCenterView( | 94 message_center_view_ = new MessageCenterView( |
95 message_center(), | 95 message_center(), |
96 tray(), | 96 tray(), |
97 max_height(), | 97 max_height(), |
98 initially_settings_visible_, | 98 initially_settings_visible_, |
99 false /* MessageCenterBubble should be used only on ChromeOS. | 99 false, /* MessageCenterBubble should be used only on ChromeOS. |
100 Message center is never shown top down in ChromeOS. */); | 100 Message center is never shown top down in ChromeOS. */ |
| 101 title_); |
101 bubble_view()->AddChildView(new ContentsView(this, message_center_view_)); | 102 bubble_view()->AddChildView(new ContentsView(this, message_center_view_)); |
102 // Resize the content of the bubble view to the given bubble size. This is | 103 // Resize the content of the bubble view to the given bubble size. This is |
103 // necessary in case of the bubble border forcing a bigger size then the | 104 // necessary in case of the bubble border forcing a bigger size then the |
104 // |new_bubble_view| actually wants. See crbug.com/169390. | 105 // |new_bubble_view| actually wants. See crbug.com/169390. |
105 bubble_view()->Layout(); | 106 bubble_view()->Layout(); |
106 UpdateBubbleView(); | 107 UpdateBubbleView(); |
107 } | 108 } |
108 | 109 |
109 void MessageCenterBubble::OnBubbleViewDestroyed() { | 110 void MessageCenterBubble::OnBubbleViewDestroyed() { |
110 message_center_view_ = NULL; | 111 message_center_view_ = NULL; |
(...skipping 19 matching lines...) Expand all Loading... |
130 } | 131 } |
131 | 132 |
132 void MessageCenterBubble::OnMouseExitedView() { | 133 void MessageCenterBubble::OnMouseExitedView() { |
133 } | 134 } |
134 | 135 |
135 size_t MessageCenterBubble::NumMessageViewsForTest() const { | 136 size_t MessageCenterBubble::NumMessageViewsForTest() const { |
136 return message_center_view_->NumMessageViewsForTest(); | 137 return message_center_view_->NumMessageViewsForTest(); |
137 } | 138 } |
138 | 139 |
139 } // namespace message_center | 140 } // namespace message_center |
OLD | NEW |