| OLD | NEW | 
|    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" | 
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   88   button_bar_ = new MessageCenterButtonBar( |   88   button_bar_ = new MessageCenterButtonBar( | 
|   89       this, message_center, notifier_settings_provider, |   89       this, message_center, notifier_settings_provider, | 
|   90       initially_settings_visible, GetButtonBarTitle()); |   90       initially_settings_visible, GetButtonBarTitle()); | 
|   91   button_bar_->SetCloseAllButtonEnabled(false); |   91   button_bar_->SetCloseAllButtonEnabled(false); | 
|   92  |   92  | 
|   93   const int button_height = button_bar_->GetPreferredSize().height(); |   93   const int button_height = button_bar_->GetPreferredSize().height(); | 
|   94  |   94  | 
|   95   scroller_ = new views::ScrollView(); |   95   scroller_ = new views::ScrollView(); | 
|   96   scroller_->ClipHeightTo(kMinScrollViewHeight, max_height - button_height); |   96   scroller_->ClipHeightTo(kMinScrollViewHeight, max_height - button_height); | 
|   97   scroller_->SetVerticalScrollBar(new views::OverlayScrollBar(false)); |   97   scroller_->SetVerticalScrollBar(new views::OverlayScrollBar(false)); | 
 |   98   scroller_->SetHorizontalScrollBar(new views::OverlayScrollBar(true)); | 
|   98   scroller_->set_background( |   99   scroller_->set_background( | 
|   99       views::Background::CreateSolidBackground(kMessageCenterBackgroundColor)); |  100       views::Background::CreateSolidBackground(kMessageCenterBackgroundColor)); | 
|  100  |  101  | 
|  101   scroller_->SetPaintToLayer(true); |  102   scroller_->SetPaintToLayer(true); | 
|  102   scroller_->layer()->SetFillsBoundsOpaquely(false); |  103   scroller_->layer()->SetFillsBoundsOpaquely(false); | 
|  103   scroller_->layer()->SetMasksToBounds(true); |  104   scroller_->layer()->SetMasksToBounds(true); | 
|  104  |  105  | 
|  105   message_list_view_.reset(new MessageListView()); |  106   message_list_view_.reset(new MessageListView()); | 
|  106   message_list_view_->set_owned_by_client(); |  107   message_list_view_->set_owned_by_client(); | 
|  107   message_list_view_->AddObserver(this); |  108   message_list_view_->AddObserver(this); | 
| (...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  637     // Disable the close-all button since no notification is visible. |  638     // Disable the close-all button since no notification is visible. | 
|  638     button_bar_->SetCloseAllButtonEnabled(false); |  639     button_bar_->SetCloseAllButtonEnabled(false); | 
|  639   } |  640   } | 
|  640 } |  641 } | 
|  641  |  642  | 
|  642 void MessageCenterView::SetNotificationViewForTest(MessageView* view) { |  643 void MessageCenterView::SetNotificationViewForTest(MessageView* view) { | 
|  643   message_list_view_->AddNotificationAt(view, 0); |  644   message_list_view_->AddNotificationAt(view, 0); | 
|  644 } |  645 } | 
|  645  |  646  | 
|  646 }  // namespace message_center |  647 }  // namespace message_center | 
| OLD | NEW |