Commit 1a656aba authored by yoshiki's avatar yoshiki Committed by Commit bot

Remove "top_down" flag in the message center code

BUG=672392
TEST=trybots pass

Review-Url: https://codereview.chromium.org/2558083005
Cr-Commit-Position: refs/heads/master@{#437595}
parent 8f71ad42
...@@ -95,9 +95,7 @@ void MessageCenterBubble::InitializeContents( ...@@ -95,9 +95,7 @@ void MessageCenterBubble::InitializeContents(
set_bubble_view(new_bubble_view); set_bubble_view(new_bubble_view);
bubble_view()->GetWidget()->AddObserver(this); bubble_view()->GetWidget()->AddObserver(this);
message_center_view_ = new MessageCenterView( message_center_view_ = new MessageCenterView(
message_center(), tray(), max_height(), initially_settings_visible_, message_center(), tray(), max_height(), initially_settings_visible_);
false); /* MessageCenterBubble should be used only on ChromeOS.
Message center is never shown top down in ChromeOS. */
bubble_view()->AddChildView(new ContentsView(this, message_center_view_)); bubble_view()->AddChildView(new ContentsView(this, message_center_view_));
// Resize the content of the bubble view to the given bubble size. This is // Resize the content of the bubble view to the given bubble size. This is
// necessary in case of the bubble border forcing a bigger size then the // necessary in case of the bubble border forcing a bigger size then the
......
...@@ -62,14 +62,12 @@ void SetViewHierarchyEnabled(views::View* view, bool enabled) { ...@@ -62,14 +62,12 @@ void SetViewHierarchyEnabled(views::View* view, bool enabled) {
MessageCenterView::MessageCenterView(MessageCenter* message_center, MessageCenterView::MessageCenterView(MessageCenter* message_center,
MessageCenterTray* tray, MessageCenterTray* tray,
int max_height, int max_height,
bool initially_settings_visible, bool initially_settings_visible)
bool top_down)
: message_center_(message_center), : message_center_(message_center),
tray_(tray), tray_(tray),
scroller_(NULL), scroller_(NULL),
settings_view_(NULL), settings_view_(NULL),
button_bar_(NULL), button_bar_(NULL),
top_down_(top_down),
settings_visible_(initially_settings_visible), settings_visible_(initially_settings_visible),
source_view_(NULL), source_view_(NULL),
source_height_(0), source_height_(0),
...@@ -104,7 +102,7 @@ MessageCenterView::MessageCenterView(MessageCenter* message_center, ...@@ -104,7 +102,7 @@ MessageCenterView::MessageCenterView(MessageCenter* message_center,
scroller_->layer()->SetFillsBoundsOpaquely(false); scroller_->layer()->SetFillsBoundsOpaquely(false);
scroller_->layer()->SetMasksToBounds(true); scroller_->layer()->SetMasksToBounds(true);
message_list_view_.reset(new MessageListView(top_down)); message_list_view_.reset(new MessageListView());
message_list_view_->set_owned_by_client(); message_list_view_->set_owned_by_client();
message_list_view_->AddObserver(this); message_list_view_->AddObserver(this);
...@@ -215,19 +213,16 @@ void MessageCenterView::Layout() { ...@@ -215,19 +213,16 @@ void MessageCenterView::Layout() {
bool animating = settings_transition_animation_ && bool animating = settings_transition_animation_ &&
settings_transition_animation_->is_animating(); settings_transition_animation_->is_animating();
if (animating && settings_transition_animation_->current_part_index() == 0) { if (animating && settings_transition_animation_->current_part_index() == 0) {
if (!top_down_) { button_bar_->SetBounds(0, height() - button_height, width(), button_height);
button_bar_->SetBounds(
0, height() - button_height, width(), button_height);
}
return; return;
} }
scroller_->SetBounds(0, scroller_->SetBounds(0,
top_down_ ? button_height : 0, 0,
width(), width(),
height() - button_height); height() - button_height);
settings_view_->SetBounds(0, settings_view_->SetBounds(0,
top_down_ ? button_height : 0, 0,
width(), width(),
height() - button_height); height() - button_height);
...@@ -242,15 +237,15 @@ void MessageCenterView::Layout() { ...@@ -242,15 +237,15 @@ void MessageCenterView::Layout() {
// Draw separator line on the top of the button bar if it is on the bottom // Draw separator line on the top of the button bar if it is on the bottom
// or draw it at the bottom if the bar is on the top. // or draw it at the bottom if the bar is on the top.
button_bar_->SetBorder(views::CreateSolidSidedBorder( button_bar_->SetBorder(views::CreateSolidSidedBorder(
top_down_ ? 0 : 1, 0, top_down_ ? 1 : 0, 0, kFooterDelimiterColor)); 1, 0, 0, 0, kFooterDelimiterColor));
} else { } else {
button_bar_->SetBorder( button_bar_->SetBorder(
views::CreateEmptyBorder(top_down_ ? 0 : 1, 0, top_down_ ? 1 : 0, 0)); views::CreateEmptyBorder(1, 0, 0, 0));
} }
button_bar_->SchedulePaint(); button_bar_->SchedulePaint();
} }
button_bar_->SetBounds(0, button_bar_->SetBounds(0,
top_down_ ? 0 : height() - button_height, height() - button_height,
width(), width(),
button_height); button_height);
if (GetWidget()) if (GetWidget())
......
...@@ -45,8 +45,7 @@ class MESSAGE_CENTER_EXPORT MessageCenterView ...@@ -45,8 +45,7 @@ class MESSAGE_CENTER_EXPORT MessageCenterView
MessageCenterView(MessageCenter* message_center, MessageCenterView(MessageCenter* message_center,
MessageCenterTray* tray, MessageCenterTray* tray,
int max_height, int max_height,
bool initially_settings_visible, bool initially_settings_visible);
bool top_down);
~MessageCenterView() override; ~MessageCenterView() override;
void SetNotifications(const NotificationList::Notifications& notifications); void SetNotifications(const NotificationList::Notifications& notifications);
...@@ -123,7 +122,6 @@ class MESSAGE_CENTER_EXPORT MessageCenterView ...@@ -123,7 +122,6 @@ class MESSAGE_CENTER_EXPORT MessageCenterView
std::unique_ptr<MessageListView> message_list_view_; std::unique_ptr<MessageListView> message_list_view_;
NotifierSettingsView* settings_view_; NotifierSettingsView* settings_view_;
MessageCenterButtonBar* button_bar_; MessageCenterButtonBar* button_bar_;
bool top_down_;
// Data for transition animation between settings view and message list. // Data for transition animation between settings view and message list.
bool settings_visible_; bool settings_visible_;
......
...@@ -215,7 +215,7 @@ void MessageCenterViewTest::SetUp() { ...@@ -215,7 +215,7 @@ void MessageCenterViewTest::SetUp() {
// Then create a new MessageCenterView with that single notification. // Then create a new MessageCenterView with that single notification.
message_center_view_.reset(new MessageCenterView( message_center_view_.reset(new MessageCenterView(
message_center_.get(), NULL, 100, false, /*top_down =*/false)); message_center_.get(), NULL, 100, false));
GetMessageListView()->quit_message_loop_after_animation_for_test_ = true; GetMessageListView()->quit_message_loop_after_animation_for_test_ = true;
GetMessageCenterView()->SetBounds(0, 0, 380, 600); GetMessageCenterView()->SetBounds(0, 0, 380, 600);
message_center_view_->SetNotifications(notifications); message_center_view_->SetNotifications(notifications);
......
...@@ -23,12 +23,11 @@ namespace { ...@@ -23,12 +23,11 @@ namespace {
const int kAnimateClearingNextNotificationDelayMS = 40; const int kAnimateClearingNextNotificationDelayMS = 40;
} // namespace } // namespace
MessageListView::MessageListView(bool top_down) MessageListView::MessageListView()
: reposition_top_(-1), : reposition_top_(-1),
fixed_height_(0), fixed_height_(0),
has_deferred_task_(false), has_deferred_task_(false),
clear_all_started_(false), clear_all_started_(false),
top_down_(top_down),
animator_(this), animator_(this),
quit_message_loop_after_animation_for_test_(false), quit_message_loop_after_animation_for_test_(false),
weak_ptr_factory_(this) { weak_ptr_factory_(this) {
...@@ -45,9 +44,9 @@ MessageListView::MessageListView(bool top_down) ...@@ -45,9 +44,9 @@ MessageListView::MessageListView(bool top_down)
set_background( set_background(
views::Background::CreateSolidBackground(kMessageCenterBackgroundColor)); views::Background::CreateSolidBackground(kMessageCenterBackgroundColor));
SetBorder(views::CreateEmptyBorder( SetBorder(views::CreateEmptyBorder(
top_down ? 0 : kMarginBetweenItems - shadow_insets.top(), /* top */ kMarginBetweenItems - shadow_insets.top(), /* top */
kMarginBetweenItems - shadow_insets.left(), /* left */ kMarginBetweenItems - shadow_insets.left(), /* left */
top_down ? kMarginBetweenItems - shadow_insets.bottom() : 0, /* bottom */ 0, /* bottom */
kMarginBetweenItems - shadow_insets.right() /* right */)); kMarginBetweenItems - shadow_insets.right() /* right */));
animator_.AddObserver(this); animator_.AddObserver(this);
} }
...@@ -287,8 +286,7 @@ void MessageListView::DoUpdateIfPossible() { ...@@ -287,8 +286,7 @@ void MessageListView::DoUpdateIfPossible() {
int new_height = GetHeightForWidth(child_area.width() + GetInsets().width()); int new_height = GetHeightForWidth(child_area.width() + GetInsets().width());
SetSize(gfx::Size(child_area.width() + GetInsets().width(), new_height)); SetSize(gfx::Size(child_area.width() + GetInsets().width(), new_height));
if (top_down_ || if (base::CommandLine::ForCurrentProcess()->HasSwitch(
base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableMessageCenterAlwaysScrollUpUponNotificationRemoval)) switches::kEnableMessageCenterAlwaysScrollUpUponNotificationRemoval))
AnimateNotificationsBelowTarget(); AnimateNotificationsBelowTarget();
else else
......
...@@ -38,7 +38,7 @@ class MESSAGE_CENTER_EXPORT MessageListView ...@@ -38,7 +38,7 @@ class MESSAGE_CENTER_EXPORT MessageListView
virtual void OnAllNotificationsCleared() = 0; virtual void OnAllNotificationsCleared() = 0;
}; };
explicit MessageListView(bool top_down); MessageListView();
~MessageListView() override; ~MessageListView() override;
void AddNotificationAt(MessageView* view, int i); void AddNotificationAt(MessageView* view, int i);
...@@ -98,7 +98,6 @@ class MESSAGE_CENTER_EXPORT MessageListView ...@@ -98,7 +98,6 @@ class MESSAGE_CENTER_EXPORT MessageListView
int fixed_height_; int fixed_height_;
bool has_deferred_task_; bool has_deferred_task_;
bool clear_all_started_; bool clear_all_started_;
bool top_down_;
std::set<views::View*> adding_views_; std::set<views::View*> adding_views_;
std::set<views::View*> deleting_views_; std::set<views::View*> deleting_views_;
std::set<views::View*> deleted_when_done_; std::set<views::View*> deleted_when_done_;
......
...@@ -93,7 +93,7 @@ class MessageListViewTest : public views::ViewsTestBase, ...@@ -93,7 +93,7 @@ class MessageListViewTest : public views::ViewsTestBase,
void SetUp() override { void SetUp() override {
views::ViewsTestBase::SetUp(); views::ViewsTestBase::SetUp();
message_list_view_.reset(new MessageListView(false /* top_down */)); message_list_view_.reset(new MessageListView());
message_list_view_->AddObserver(this); message_list_view_->AddObserver(this);
message_list_view_->set_owned_by_client(); message_list_view_->set_owned_by_client();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment