Made notification center notifications collapsed and expandable.

ui/message_center/message_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/message_center/message_view.h"
 
 #include "grit/ui_resources.h"
 #include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
-const int kCloseButtonSize = 29;
+const int kControlButtonSize = 29;
 const int kCloseIconTopPadding = 5;
 const int kCloseIconRightPadding = 5;
+const int kExpandIconBottomPadding = 8;
+const int kExpandIconRightPadding = 11;
 
 // ControlButtons are ImageButtons whose image can be padded within the button.
 // This allows the creation of buttons like the notification close and expand
 // buttons whose clickable areas extends beyond their image areas
 // (<http://crbug.com/168822>) without the need to create and maintain
 // corresponding resource images with alpha padding. In the future, this class
 // will also allow for buttons whose touch areas extend beyond their clickable
 // area (<http://crbug.com/168856>).
 class ControlButton : public views::ImageButton {
  public:
@@ skipping 49 matching lines @@
                resource_id));
 }
 
 void ControlButton::SetPressedImage(int resource_id) {
   SetImage(views::CustomButton::STATE_PRESSED,
            ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
                resource_id));
 }
 
 gfx::Size ControlButton::GetPreferredSize() {
-  return gfx::Size(kCloseButtonSize, kCloseButtonSize);
+  return gfx::Size(kControlButtonSize, kControlButtonSize);
 }
 
 void ControlButton::OnPaint(gfx::Canvas* canvas) {
   // This is the same implementation as ImageButton::OnPaint except
   // that it calls ComputePaddedImagePaintPosition() instead of
   // ComputeImagePaintPosition(), in effect overriding that private method.
   View::OnPaint(canvas);
   gfx::ImageSkia image = GetImageToPaint();
   if (!image.isNull()) {
     gfx::Point position = ComputePaddedImagePaintPosition(image);
@@ skipping 113 matching lines @@
   Notification notification_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNotificationMenuModel);
 };
 
 MessageView::MessageView(
     NotificationList::Delegate* list_delegate,
     const Notification& notification)
     : list_delegate_(list_delegate),
       notification_(notification),
-      scroller_(NULL) {
+      scroller_(NULL),
+      expanded_(false) {
   ControlButton *close = new ControlButton(this);
   close->SetPadding(-kCloseIconRightPadding, kCloseIconTopPadding);
   close->SetNormalImage(IDR_NOTIFICATION_CLOSE);
   close->SetHoveredImage(IDR_NOTIFICATION_CLOSE_HOVER);
   close->SetPressedImage(IDR_NOTIFICATION_CLOSE_PRESSED);
+  close->set_owned_by_client();

[dharcourt, 2013/02/23 04:32:00]

This isn't strictly needed because close_button_ will be deleted by the
scoped_ptr's destructor before the parent views::View's destructor is called,
and this deletion will remove it from the children_ vector, so the parent's
destructor will never even check for owner_by_client_, but it doesn't hurt to
have this just in case RemoveAllChildViews() gets called from somewhere else in
the future.

   close_button_.reset(close);
+
+  ControlButton *expand = new ControlButton(this);
+  expand->SetPadding(-kExpandIconRightPadding, -kExpandIconBottomPadding);
+  expand->SetNormalImage(IDR_NOTIFICATIONS_EXPAND);
+  expand->SetHoveredImage(IDR_NOTIFICATIONS_EXPAND_HOVER);
+  expand->SetPressedImage(IDR_NOTIFICATIONS_EXPAND_PRESSED);
+  expand->set_owned_by_client();
+  expand_button_.reset(expand);
 }
 
 MessageView::MessageView() {
 }
 
 MessageView::~MessageView() {
 }
 
 bool MessageView::OnMousePressed(const ui::MouseEvent& event) {
   if (event.flags() & ui::EF_RIGHT_MOUSE_BUTTON) {
@@ skipping 27 matching lines @@
 
   if (scroller_)
     scroller_->OnGestureEvent(event);
   event->SetHandled();
 }
 
 void MessageView::ButtonPressed(views::Button* sender,
                                 const ui::Event& event) {
   if (sender == close_button())
     list_delegate_->SendRemoveNotification(notification_.id);
+  else if (sender == expand_button())
+    SetExpanded(!expanded_);
+}
+
+bool MessageView::IsExpanded() {
+  return expanded_;
+}
+
+void MessageView::SetExpanded(bool expanded) {
+  expanded_ = expanded;
 }
 
 void MessageView::ShowMenu(gfx::Point screen_location) {
   WebNotificationMenuModel menu_model(list_delegate_, notification_);
   if (menu_model.GetItemCount() == 0)
     return;
 
   views::MenuModelAdapter menu_model_adapter(&menu_model);
   views::MenuRunner menu_runner(menu_model_adapter.CreateMenu());
 
   views::View::ConvertPointToScreen(this, &screen_location);
   ignore_result(menu_runner.RunMenuAt(
       GetWidget()->GetTopLevelWidget(),
       NULL,
       gfx::Rect(screen_location, gfx::Size()),
       views::MenuItemView::TOPRIGHT,
       views::MenuRunner::HAS_MNEMONICS));
 }
 
 void MessageView::OnSlideOut() {
   list_delegate_->SendRemoveNotification(notification_.id);
 }
 
 }  // namespace message_center