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 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
307 : MessageBubbleBase(delegate), | 307 : MessageBubbleBase(delegate), |
308 contents_view_(NULL) { | 308 contents_view_(NULL) { |
309 } | 309 } |
310 | 310 |
311 MessageCenterBubble::~MessageCenterBubble() {} | 311 MessageCenterBubble::~MessageCenterBubble() {} |
312 | 312 |
313 views::TrayBubbleView::InitParams MessageCenterBubble::GetInitParams( | 313 views::TrayBubbleView::InitParams MessageCenterBubble::GetInitParams( |
314 views::TrayBubbleView::AnchorAlignment anchor_alignment) { | 314 views::TrayBubbleView::AnchorAlignment anchor_alignment) { |
315 views::TrayBubbleView::InitParams init_params = | 315 views::TrayBubbleView::InitParams init_params = |
316 GetDefaultInitParams(anchor_alignment); | 316 GetDefaultInitParams(anchor_alignment); |
| 317 init_params.min_width += kMarginBetweenItems * 2; |
| 318 init_params.max_width += kMarginBetweenItems * 2; |
317 init_params.max_height = kMessageBubbleBaseMaxHeight; | 319 init_params.max_height = kMessageBubbleBaseMaxHeight; |
318 init_params.bubble_width += kMarginBetweenItems * 2; | |
319 init_params.can_activate = true; | 320 init_params.can_activate = true; |
320 return init_params; | 321 return init_params; |
321 } | 322 } |
322 | 323 |
323 void MessageCenterBubble::InitializeContents( | 324 void MessageCenterBubble::InitializeContents( |
324 views::TrayBubbleView* new_bubble_view) { | 325 views::TrayBubbleView* new_bubble_view) { |
325 set_bubble_view(new_bubble_view); | 326 set_bubble_view(new_bubble_view); |
326 contents_view_ = new MessageCenterContentsView(list_delegate()); | 327 contents_view_ = new MessageCenterContentsView(list_delegate()); |
327 bubble_view()->AddChildView(contents_view_); | 328 bubble_view()->AddChildView(contents_view_); |
328 UpdateBubbleView(); | 329 UpdateBubbleView(); |
(...skipping 17 matching lines...) Expand all Loading... |
346 } | 347 } |
347 | 348 |
348 void MessageCenterBubble::OnMouseExitedView() { | 349 void MessageCenterBubble::OnMouseExitedView() { |
349 } | 350 } |
350 | 351 |
351 size_t MessageCenterBubble::NumMessageViewsForTest() const { | 352 size_t MessageCenterBubble::NumMessageViewsForTest() const { |
352 return contents_view_->NumMessageViews(); | 353 return contents_view_->NumMessageViews(); |
353 } | 354 } |
354 | 355 |
355 } // namespace message_center | 356 } // namespace message_center |
OLD | NEW |