Notifications: Retain button hover state during content updates.

ui/message_center/views/notification_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/views/notification_view.h"
 
 #include "base/command_line.h"
+#include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "grit/ui_strings.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/size.h"
@@ skipping 426 matching lines @@
 }
 
 views::View* NotificationView::GetEventHandlerForRect(const gfx::Rect& rect) {
   // TODO(tdanderson): Modify this function to support rect-based event
   // targeting. Using the center point of |rect| preserves this function's
   // expected behavior for the time being.
   gfx::Point point = rect.CenterPoint();
 
   // Want to return this for underlying views, otherwise GetCursor is not
   // called. But buttons are exceptions, they'll have their own event handlings.
-  std::vector<views::View*> buttons(action_buttons_);
+  std::vector<views::View*> buttons(action_buttons_.begin(),
+                                    action_buttons_.end());
   buttons.push_back(close_button());
 
   for (size_t i = 0; i < buttons.size(); ++i) {
     gfx::Point point_in_child = point;
     ConvertPointToTarget(this, buttons[i], &point_in_child);
     if (buttons[i]->HitTestPoint(point_in_child))
       return buttons[i]->GetEventHandlerForPoint(point_in_child);
   }
 
   return this;
@@ skipping 230 matching lines @@
   if (!notification.image().IsEmpty()) {
     gfx::Size image_size(kNotificationPreferredImageWidth,
                          kNotificationPreferredImageHeight);
     image_view_ = MakeNotificationImage(notification.image(), image_size);
     bottom_view_->AddChildView(image_view_);
   }
 }
 
 void NotificationView::CreateOrUpdateActionButtonViews(
     const Notification& notification) {
-  for (size_t i = 0; i < separators_.size(); ++i)
-    delete separators_[i];
-  separators_.clear();
+  std::vector<ButtonInfo> buttons = notification.buttons();
+  bool new_buttons = action_buttons_.size() != buttons.size();
 
-  for (size_t i = 0; i < action_buttons_.size(); ++i)
-    delete action_buttons_[i];
-  action_buttons_.clear();
+  if (new_buttons || buttons.size() == 0) {
+    STLDeleteContainerPointers(separators_.begin(), separators_.end());
+    separators_.clear();

[Jun Mukai, 2014/05/23 06:24:08]

STLDeleteElements() invokes DeleteContainerPointers and then clear() :)

[dewittj, 2014/05/23 17:32:41]

Done.

+
+    STLDeleteContainerPointers(action_buttons_.begin(), action_buttons_.end());
+    action_buttons_.clear();
+  }
 
   DCHECK(bottom_view_);
   DCHECK_EQ(this, bottom_view_->parent());
 
-  std::vector<ButtonInfo> buttons = notification.buttons();
   for (size_t i = 0; i < buttons.size(); ++i) {
-    views::View* separator = new views::ImageView();
-    separator->SetBorder(MakeSeparatorBorder(1, 0, kButtonSeparatorColor));
-    separators_.push_back(separator);
-    bottom_view_->AddChildView(separator);
-    NotificationButton* button = new NotificationButton(this);
     ButtonInfo button_info = buttons[i];
-    button->SetTitle(button_info.title);
-    button->SetIcon(button_info.icon.AsImageSkia());
-    action_buttons_.push_back(button);
-    bottom_view_->AddChildView(button);
+    if (new_buttons) {
+      views::View* separator = new views::ImageView();
+      separator->SetBorder(MakeSeparatorBorder(1, 0, kButtonSeparatorColor));
+      separators_.push_back(separator);
+      bottom_view_->AddChildView(separator);
+      NotificationButton* button = new NotificationButton(this);
+      button->SetTitle(button_info.title);
+      button->SetIcon(button_info.icon.AsImageSkia());
+      action_buttons_.push_back(button);
+      bottom_view_->AddChildView(button);
+    } else {
+      action_buttons_[i]->SetTitle(button_info.title);
+      action_buttons_[i]->SetIcon(button_info.icon.AsImageSkia());
+      action_buttons_[i]->SchedulePaint();
+      action_buttons_[i]->Layout();
+    }
+  }
+
+  if (new_buttons) {
+    Layout();
+    views::Widget* widget = GetWidget();
+    if (widget != NULL) {
+      widget->SetSize(widget->GetContentsView()->GetPreferredSize());
+      GetWidget()->SynthesizeMouseMoveEvent();
+    }
   }
 }
 
 int NotificationView::GetMessageLineLimit(int title_lines, int width) {
   // Image notifications require that the image must be kept flush against
   // their icons, but we can allow more text if no image.
   int effective_title_lines = std::max(0, title_lines - 1);
   int line_reduction_from_title = (image_view_ ? 1 : 2) * effective_title_lines;
   if (!image_view_) {
     // Title lines are counted as twice as big as message lines for the purpose
@@ skipping 25 matching lines @@
 
   return message_line_limit;
 }
 
 int NotificationView::GetMessageHeight(int width, int limit) {
   return message_view_ ?
          message_view_->GetSizeForWidthAndLines(width, limit).height() : 0;
 }
 
 }  // namespace message_center