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/message_center_bubble.h" | 5 #include "ui/message_center/message_center_bubble.h" |
6 | 6 |
7 #include "grit/ui_strings.h" | 7 #include "grit/ui_strings.h" |
8 #include "ui/base/l10n/l10n_util.h" | 8 #include "ui/base/l10n/l10n_util.h" |
9 #include "ui/base/resource/resource_bundle.h" | 9 #include "ui/base/resource/resource_bundle.h" |
10 #include "ui/gfx/size.h" | 10 #include "ui/gfx/size.h" |
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
269 : MessageBubbleBase(delegate), | 269 : MessageBubbleBase(delegate), |
270 contents_view_(NULL) { | 270 contents_view_(NULL) { |
271 } | 271 } |
272 | 272 |
273 MessageCenterBubble::~MessageCenterBubble() {} | 273 MessageCenterBubble::~MessageCenterBubble() {} |
274 | 274 |
275 views::TrayBubbleView::InitParams MessageCenterBubble::GetInitParams( | 275 views::TrayBubbleView::InitParams MessageCenterBubble::GetInitParams( |
276 views::TrayBubbleView::AnchorAlignment anchor_alignment) { | 276 views::TrayBubbleView::AnchorAlignment anchor_alignment) { |
277 views::TrayBubbleView::InitParams init_params = | 277 views::TrayBubbleView::InitParams init_params = |
278 GetDefaultInitParams(anchor_alignment); | 278 GetDefaultInitParams(anchor_alignment); |
| 279 init_params.min_width += kMarginBetweenItems * 2; |
| 280 init_params.max_width += kMarginBetweenItems * 2; |
279 init_params.max_height = kMessageBubbleBaseMaxHeight; | 281 init_params.max_height = kMessageBubbleBaseMaxHeight; |
280 init_params.bubble_width += kMarginBetweenItems * 2; | |
281 init_params.can_activate = true; | 282 init_params.can_activate = true; |
282 return init_params; | 283 return init_params; |
283 } | 284 } |
284 | 285 |
285 void MessageCenterBubble::InitializeContents( | 286 void MessageCenterBubble::InitializeContents( |
286 views::TrayBubbleView* new_bubble_view) { | 287 views::TrayBubbleView* new_bubble_view) { |
287 set_bubble_view(new_bubble_view); | 288 set_bubble_view(new_bubble_view); |
288 contents_view_ = new MessageCenterContentsView(list_delegate()); | 289 contents_view_ = new MessageCenterContentsView(list_delegate()); |
289 bubble_view()->AddChildView(contents_view_); | 290 bubble_view()->AddChildView(contents_view_); |
290 UpdateBubbleView(); | 291 UpdateBubbleView(); |
(...skipping 17 matching lines...) Expand all Loading... |
308 } | 309 } |
309 | 310 |
310 void MessageCenterBubble::OnMouseExitedView() { | 311 void MessageCenterBubble::OnMouseExitedView() { |
311 } | 312 } |
312 | 313 |
313 size_t MessageCenterBubble::NumMessageViewsForTest() const { | 314 size_t MessageCenterBubble::NumMessageViewsForTest() const { |
314 return contents_view_->NumMessageViews(); | 315 return contents_view_->NumMessageViews(); |
315 } | 316 } |
316 | 317 |
317 } // namespace message_center | 318 } // namespace message_center |
OLD | NEW |