Remove the most obvious dead code from message center.

Remove the most obvious dead code from message center.

r=mukai@chromium.org,stevenjb@chromium.org
TBR=johnnyg@chromium.org

BUG=254719
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=210425

[dewittj, 2013-07-01 18:02:00]

ptal.  This will need to land after https://codereview.chromium.org/18239002/

[dewittj, 2013-07-01 18:03:02]

ptal, this needs to land after https://codereview.chromium.org/18239002/ 

The most interesting changes are in the views where I had to merge the
Rich/Poor/Basic versions of the list view and the bottom bar.

[dewittj, 2013-07-01 20:43:26]

The prerequisite CL is now landed.

[Jun Mukai, 2013-07-01 20:48:58]

lgtm

https://codereview.chromium.org/18247002/diff/2001/ash/system/web_notificatio...
File ash/system/web_notification/web_notification_tray.h (left):

https://codereview.chromium.org/18247002/diff/2001/ash/system/web_notificatio...
ash/system/web_notification/web_notification_tray.h:152:
scoped_ptr<internal::WebNotificationBubbleWrapper> popup_bubble_;
you can remove popup_bubble_ field too

https://codereview.chromium.org/18247002/diff/2001/ui/message_center/views/me...
File ui/message_center/views/message_bubble_base.cc (right):

https://codereview.chromium.org/18247002/diff/2001/ui/message_center/views/me...
ui/message_center/views/message_bubble_base.cc:25:
MessageBubbleBase::MessageBubbleBase(MessageCenter* message_center,
MessageBubbleBase is also unnecessary, we can merge both into single
MessageCenterBubble class.
not necessary to do in this CL though.

https://codereview.chromium.org/18247002/diff/2001/ui/message_center/views/me...
File ui/message_center/views/message_center_view.cc (right):

https://codereview.chromium.org/18247002/diff/2001/ui/message_center/views/me...
ui/message_center/views/message_center_view.cc:341: // Overridden from
MessageListView.
not overridden.  you should remove virtual too

[dewittj, 2013-07-01 23:58:30]

https://codereview.chromium.org/18247002/diff/2001/ash/system/web_notificatio...
File ash/system/web_notification/web_notification_tray.h (left):

https://codereview.chromium.org/18247002/diff/2001/ash/system/web_notificatio...
ash/system/web_notification/web_notification_tray.h:152:
scoped_ptr<internal::WebNotificationBubbleWrapper> popup_bubble_;
On 2013/07/01 20:48:58, Jun Mukai wrote:
> you can remove popup_bubble_ field too

Done.

https://codereview.chromium.org/18247002/diff/2001/ui/message_center/views/me...
File ui/message_center/views/message_bubble_base.cc (right):

https://codereview.chromium.org/18247002/diff/2001/ui/message_center/views/me...
ui/message_center/views/message_bubble_base.cc:25:
MessageBubbleBase::MessageBubbleBase(MessageCenter* message_center,
On 2013/07/01 20:48:58, Jun Mukai wrote:
> MessageBubbleBase is also unnecessary, we can merge both into single
> MessageCenterBubble class.
> not necessary to do in this CL though.

That's slightly more invasive.  I'll leave it for next time.

https://codereview.chromium.org/18247002/diff/2001/ui/message_center/views/me...
File ui/message_center/views/message_center_view.cc (right):

https://codereview.chromium.org/18247002/diff/2001/ui/message_center/views/me...
ui/message_center/views/message_center_view.cc:341: // Overridden from
MessageListView.
On 2013/07/01 20:48:58, Jun Mukai wrote:
> not overridden.  you should remove virtual too

Done.

[Jun Mukai, 2013-07-02 00:14:37]

lgtm

https://codereview.chromium.org/18247002/diff/2001/ui/message_center/views/me...
File ui/message_center/views/message_bubble_base.cc (right):

https://codereview.chromium.org/18247002/diff/2001/ui/message_center/views/me...
ui/message_center/views/message_bubble_base.cc:25:
MessageBubbleBase::MessageBubbleBase(MessageCenter* message_center,
On 2013/07/01 23:58:30, dewittj wrote:
> On 2013/07/01 20:48:58, Jun Mukai wrote:
> > MessageBubbleBase is also unnecessary, we can merge both into single
> > MessageCenterBubble class.
> > not necessary to do in this CL though.
> 
> That's slightly more invasive.  I'll leave it for next time.

sgtm

[commit-bot: I haz the power, 2013-07-02 00:15:22]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dewittj@chromium.org/18247002/17001

[commit-bot: I haz the power, 2013-07-02 00:15:46]

Failed to apply patch for ui/message_center/views/message_center_view.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ui/message_center/views/message_center_view.cc
  Hunk #6 succeeded at 353 with fuzz 2 (offset 2 lines).
  Hunk #7 FAILED at 358.
  Hunk #8 succeeded at 369 (offset -2 lines).
  Hunk #9 succeeded at 384 (offset -2 lines).
  Hunk #10 succeeded at 415 (offset -2 lines).
  Hunk #11 FAILED at 441.
  Hunk #12 succeeded at 448 (offset -4 lines).
  Hunk #13 succeeded at 464 (offset -4 lines).
  Hunk #14 succeeded at 481 (offset -4 lines).
  Hunk #15 succeeded at 493 (offset -4 lines).
  Hunk #16 succeeded at 529 with fuzz 1 (offset 14 lines).
  Hunk #17 succeeded at 552 (offset 14 lines).
  Hunk #18 succeeded at 565 (offset 14 lines).
  Hunk #19 succeeded at 576 (offset 14 lines).
  Hunk #20 FAILED at 581.
  Hunk #21 succeeded at 601 with fuzz 1 (offset 4 lines).
  Hunk #22 succeeded at 651 (offset 4 lines).
  Hunk #23 succeeded at 671 (offset 4 lines).
  Hunk #24 succeeded at 688 (offset 4 lines).
  Hunk #25 succeeded at 709 (offset 4 lines).
  Hunk #26 succeeded at 721 (offset 4 lines).
  Hunk #27 succeeded at 822 (offset 4 lines).
  Hunk #28 succeeded at 831 (offset 4 lines).
  3 out of 28 hunks FAILED -- saving rejects to file
ui/message_center/views/message_center_view.cc.rej

Patch:       ui/message_center/views/message_center_view.cc
Index: ui/message_center/views/message_center_view.cc
diff --git a/ui/message_center/views/message_center_view.cc
b/ui/message_center/views/message_center_view.cc
index
92b79715c9479585c67fbacde4010607c13f6668..edac0f89a7b2e1135b86e2ba48747827de9757ba
100644
--- a/ui/message_center/views/message_center_view.cc
+++ b/ui/message_center/views/message_center_view.cc
@@ -61,63 +61,7 @@ const int kAnimateClearingNextNotificationDelayMS = 40;
 static const int kDefaultFrameRateHz = 60;
 static const int kDefaultAnimationDurationMs = 120;
 
-// PoorMessageCenterButtonBar
//////////////////////////////////////////////////
-
-// The view for the buttons at the bottom of the message center window used
-// when kEnableRichNotifications is false (hence the "poor" in the name :-).
-class PoorMessageCenterButtonBar : public MessageCenterButtonBar,
-                                   public views::ButtonListener {
- public:
-  PoorMessageCenterButtonBar(MessageCenterView* message_center_view,
-                             MessageCenter* message_center);
-
-  // Overridden from views::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) OVERRIDE;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(PoorMessageCenterButtonBar);
-};
-
-PoorMessageCenterButtonBar::PoorMessageCenterButtonBar(
-    MessageCenterView* message_center_view, MessageCenter* message_center)
-    : MessageCenterButtonBar(message_center_view, message_center) {
-  set_background(views::Background::CreateBackgroundPainter(
-      true,
-      views::Painter::CreateVerticalGradient(kBackgroundLightColor,
-                                             kBackgroundDarkColor)));
-  set_border(views::Border::CreateSolidSidedBorder(
-      2, 0, 0, 0, kBorderDarkColor));
-
-  views::GridLayout* layout = new views::GridLayout(this);
-  SetLayoutManager(layout);
-  views::ColumnSet* columns = layout->AddColumnSet(0);
-  columns->AddPaddingColumn(100, 0);
-  columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER,
-                     0, /* resize percent */
-                     views::GridLayout::USE_PREF, 0, 0);
-  columns->AddPaddingColumn(0, 4);
-
-  ui::ResourceBundle& resource_bundle =
ui::ResourceBundle::GetSharedInstance();
-  views::LabelButton* close_all_button = new views::LabelButton(
-      this, resource_bundle.GetLocalizedString(IDS_MESSAGE_CENTER_CLEAR_ALL));
-  close_all_button->SetHorizontalAlignment(gfx::ALIGN_CENTER);
-  close_all_button->set_request_focus_on_press(false);
-  close_all_button->SetTextColor(views::Button::STATE_NORMAL,
kFooterTextColor);
-  close_all_button->SetTextColor(views::Button::STATE_HOVERED,
-                                 kButtonTextHoverColor);
-
-  layout->AddPaddingRow(0, 4);
-  layout->StartRow(0, 0);
-  layout->AddView(close_all_button);
-  set_close_all_button(close_all_button);
-}
-
-void PoorMessageCenterButtonBar::ButtonPressed(views::Button* sender,
-                                               const ui::Event& event) {
-  if (sender == close_all_button())
-    message_center_view()->ClearAllNotifications();
-}
+}  // namespace
 
 // NotificationCenterButton
////////////////////////////////////////////////////
 
@@ -167,36 +111,14 @@ void
NotificationCenterButton::OnPaintFocusBorder(gfx::Canvas* canvas) {
   }
 }
 
-// RichMessageCenterButtonBar
//////////////////////////////////////////////////
-
-// TODO(mukai): Merge this into MessageCenterButtonBar and get rid of
-// PoorMessageCenterButtonBar when the kEnableRichNotifications flag
disappears.
-class RichMessageCenterButtonBar : public MessageCenterButtonBar,
-                                   public views::ButtonListener {
- public:
-  RichMessageCenterButtonBar(MessageCenterView* message_center_view,
-                             MessageCenter* message_center);
-
- private:
-  // Overridden from MessageCenterButtonBar:
-  virtual void SetAllButtonsEnabled(bool enabled) OVERRIDE;
+// MessageCenterButtonBar //////////////////////////////////////////////////
 
-  // Overridden from views::View:
-  virtual void ChildVisibilityChanged(views::View* child) OVERRIDE;
-
-  // Overridden from views::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) OVERRIDE;
-
-  NotificationCenterButton* settings_button_;
-  NotificationCenterButton* quiet_mode_button_;
-
-  DISALLOW_COPY_AND_ASSIGN(RichMessageCenterButtonBar);
-};
-
-RichMessageCenterButtonBar::RichMessageCenterButtonBar(
-    MessageCenterView* message_center_view, MessageCenter* message_center)
-  : MessageCenterButtonBar(message_center_view, message_center) {
+MessageCenterButtonBar::MessageCenterButtonBar(
+    MessageCenterView* message_center_view,
+    MessageCenter* message_center)
+    : message_center_view_(message_center_view),
+      message_center_(message_center),
+      close_all_button_(NULL) {
   if (get_use_acceleration_when_possible())
     SetPaintToLayer(true);
   set_background(views::Background::CreateSolidBackground(
@@ -265,21 +187,28 @@ RichMessageCenterButtonBar::RichMessageCenterButtonBar(
   layout->AddView(button_container);
 }
 
-// Overridden from MessageCenterButtonBar:
-void RichMessageCenterButtonBar::SetAllButtonsEnabled(bool enabled) {
-  MessageCenterButtonBar::SetAllButtonsEnabled(enabled);
+MessageCenterButtonBar::~MessageCenterButtonBar() {}
+
+void MessageCenterButtonBar::SetAllButtonsEnabled(bool enabled) {
+  if (close_all_button_)
+    close_all_button_->SetEnabled(enabled);
   settings_button_->SetEnabled(enabled);
   quiet_mode_button_->SetEnabled(enabled);
 }
 
+void MessageCenterButtonBar::SetCloseAllVisible(bool visible) {
+  if (close_all_button_)
+    close_all_button_->SetVisible(visible);
+}
+
 // Overridden from views::View:
-void RichMessageCenterButtonBar::ChildVisibilityChanged(views::View* child) {
+void MessageCenterButtonBar::ChildVisibilityChanged(views::View* child) {
   InvalidateLayout();
 }
 
 // Overridden from views::ButtonListener:
-void RichMessageCenterButtonBar::ButtonPressed(views::Button* sender,
-                                               const ui::Event& event) {
+void MessageCenterButtonBar::ButtonPressed(views::Button* sender,
+                                           const ui::Event& event) {
   if (sender == close_all_button()) {
     message_center_view()->ClearAllNotifications();
   } else if (sender == settings_button_) {
@@ -322,11 +251,9 @@ BoundedScrollView::BoundedScrollView(int min_height, int
max_height)
   set_notify_enter_exit_on_child(true);
   // Cancels the default dashed focus border.
   set_focus_border(NULL);
-  if (IsRichNotificationEnabled()) {
-    set_background(views::Background::CreateSolidBackground(
-        kMessageCenterBackgroundColor));
-    SetVerticalScrollBar(new views::OverlayScrollBar(false));
-  }
+  set_background(
+      views::Background::CreateSolidBackground(kMessageCenterBackgroundColor));
+  SetVerticalScrollBar(new views::OverlayScrollBar(false));
 }
 
 gfx::Size BoundedScrollView::GetPreferredSize() {
@@ -403,67 +330,20 @@ void NoNotificationMessageView::Layout() {
   label_->SetBounds(0, margin, width(), text_height);
 }
 
-}  // namespace
-
-// MessageListView
/////////////////////////////////////////////////////////////
-
-// Displays a list of messages.
-class MessageListView : public views::View {
- public:
-  explicit MessageListView(MessageCenterView* message_center_view);
-
-  // The interface for repositioning.
-  virtual void AddNotificationAt(views::View* view, int i);
-  virtual void RemoveNotificationAt(int i);
-  virtual void UpdateNotificationAt(views::View* view, int i);
-  virtual void SetRepositionTarget(const gfx::Rect& target_rect) {}
-  virtual void ResetRepositionSession() {}
-  virtual void ClearAllNotifications(const gfx::Rect& visible_scroll_rect);
-
- protected:
-  MessageCenterView* message_center_view() const {
-    return message_center_view_;
-  }
-
- private:
-  MessageCenterView* message_center_view_;  // Weak reference.
-
-  DISALLOW_COPY_AND_ASSIGN(MessageListView);
-};
-
-MessageListView::MessageListView(MessageCenterView* message_center_view)
-    : message_center_view_(message_center_view) {
-  views::BoxLayout* layout =
-      new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1);
-  layout->set_spread_blank_space(true);
-  SetLayoutManager(layout);
-}
-
-void MessageListView::AddNotificationAt(views::View* view, int i) {
-  AddChildViewAt(view, i);
-}
-
-void MessageListView::RemoveNoti…
(message too large)

[dewittj, 2013-07-02 17:33:12]

stevenjb, ash/system/OWNERS please.  This is just removing dead code.

[stevenjb, 2013-07-02 18:37:15]

lgtm

https://codereview.chromium.org/18247002/diff/43001/ui/message_center/views/m...
File ui/message_center/views/message_center_view.h (right):

https://codereview.chromium.org/18247002/diff/43001/ui/message_center/views/m...
ui/message_center/views/message_center_view.h:38: // otherwise please refrain
from using it :-).
As long as this is getting cleaned up, you should be able to move this class
into the .cc file, inside the message_center namespace, and forward declare it
here. Alternatively it could be a member of MessageCenterView and forward
declared inside that class, but that should only be necessary if it needed
friend access to MessageCenterView.

[dewittj, 2013-07-08 18:48:22]

https://codereview.chromium.org/18247002/diff/43001/ui/message_center/views/m...
File ui/message_center/views/message_center_view.h (right):

https://codereview.chromium.org/18247002/diff/43001/ui/message_center/views/m...
ui/message_center/views/message_center_view.h:38: // otherwise please refrain
from using it :-).
On 2013/07/02 18:37:15, stevenjb (chromium) wrote:
> As long as this is getting cleaned up, you should be able to move this class
> into the .cc file, inside the message_center namespace, and forward declare it
> here. Alternatively it could be a member of MessageCenterView and forward
> declared inside that class, but that should only be necessary if it needed
> friend access to MessageCenterView.

Done.

[stevenjb, 2013-07-08 19:11:23]

https://codereview.chromium.org/18247002/diff/43001/ui/message_center/views/m...
File ui/message_center/views/message_center_view.h (right):

https://codereview.chromium.org/18247002/diff/43001/ui/message_center/views/m...
ui/message_center/views/message_center_view.h:38: // otherwise please refrain
from using it :-).
On 2013/07/08 18:48:22, dewittj wrote:
> On 2013/07/02 18:37:15, stevenjb (chromium) wrote:
> > As long as this is getting cleaned up, you should be able to move this class
> > into the .cc file, inside the message_center namespace, and forward declare
it
> > here. Alternatively it could be a member of MessageCenterView and forward
> > declared inside that class, but that should only be necessary if it needed
> > friend access to MessageCenterView.
> 
> Done.
Thanks!

[commit-bot: I haz the power, 2013-07-08 20:17:15]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dewittj@chromium.org/18247002/48001

[commit-bot: I haz the power, 2013-07-08 21:33:59]

Change committed as 210425