Fixes the context menu for a notification.

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/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
@@ skipping 10 matching lines @@
 #include "ui/message_center/message_center_switches.h"
 #include "ui/message_center/message_center_tray.h"
 #include "ui/message_center/message_center_util.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/message_center/views/bounded_label.h"
 #include "ui/message_center/views/padded_button.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
+#include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
+#include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/progress_bar.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/painter.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
 #include "ui/base/cursor/cursor.h"
 #endif
 
@@ skipping 381 matching lines @@
     set_background(
         MakeBackground(message_center::kHoveredButtonBackgroundColor));
   } else {
     set_background(NULL);
   }
 }
 
 }  // namespace
 
 namespace message_center {
 

[stevenjb, 2013/12/12 21:19:46]

nit: Put in internal namespace, i.e. message_center::internal

[Jun Mukai, 2013/12/14 01:13:14]

this code has been removed.

+class NotificationViewContextMenuController
+    : public views::ContextMenuController {
+ public:
+  NotificationViewContextMenuController(MessageCenterTray* tray);

[stevenjb, 2013/12/12 21:19:46]

explicit

+  virtual ~NotificationViewContextMenuController();
+
+ protected:
+  // Overridden from views::ContextMenuController:
+  virtual void ShowContextMenuForView(views::View* source,
+                                      const gfx::Point& point,
+                                      ui::MenuSourceType source_type) OVERRIDE;
+
+ private:
+  MessageCenterTray* tray_;

[stevenjb, 2013/12/12 21:19:46]

nit: WS

+  DISALLOW_COPY_AND_ASSIGN(NotificationViewContextMenuController);
+};
+
+NotificationViewContextMenuController::NotificationViewContextMenuController(
+    MessageCenterTray* tray)
+    : tray_(tray) {
+}
+
+NotificationViewContextMenuController::
+~NotificationViewContextMenuController() {
+}
+
+void NotificationViewContextMenuController::ShowContextMenuForView(
+    views::View* source,
+    const gfx::Point& point,
+    ui::MenuSourceType source_type) {
+  NotificationView* view = static_cast<NotificationView*>(source);
+  scoped_ptr<ui::MenuModel> menu_model(
+      tray_->CreateMenuModelForNotification(view->notification_id()));
+  if (!menu_model.get() || menu_model->GetItemCount() == 0)
+    return;
+
+  views::MenuRunner menu_runner(menu_model.get());
+
+  ignore_result(menu_runner.RunMenuAt(
+      source->GetWidget()->GetTopLevelWidget(),
+      NULL,
+      gfx::Rect(point, gfx::Size()),
+      views::MenuItemView::TOPRIGHT,
+      source_type,
+      views::MenuRunner::HAS_MNEMONICS));
+}
+
 // NotificationView ////////////////////////////////////////////////////////////
 
 // static
 NotificationView* NotificationView::Create(const Notification& notification,
                                            MessageCenter* message_center,
                                            MessageCenterTray* tray,
                                            bool expanded,
                                            bool top_level) {
   switch (notification.type()) {
     case NOTIFICATION_TYPE_BASE_FORMAT:
@@ skipping 24 matching lines @@
 #endif
 
   notification_view->CreateShadowBorder();
   return notification_view;
 }
 
 NotificationView::NotificationView(const Notification& notification,
                                    MessageCenter* message_center,
                                    MessageCenterTray* tray,
                                    bool expanded)
-    : MessageView(notification.display_source()),
-      message_center_(message_center),
-      tray_(tray),
+    : message_center_(message_center),
       notification_id_(notification.id()),
       notifier_id_(notification.notifier_id()),
       clickable_(notification.clickable()),
-      is_expanded_(expanded) {
+      is_expanded_(expanded),
+      context_menu_controller_(
+          new NotificationViewContextMenuController(tray)) {

[stevenjb, 2013/12/12 21:19:46]

context_menu_controller_ is a View member so it shouldn't get set here.

+  set_context_menu_controller(context_menu_controller_.get());

[stevenjb, 2013/12/12 21:19:46]

This should be:
set_context_menu_controller(new NotificationViewContextMenuController(tray));

+
   std::vector<string16> accessible_lines;
 
   // Create the opaque background that's above the view's shadow.
   background_view_ = new views::View();
   background_view_->set_background(MakeBackground());
 
   // Create the top_view_, which collects into a vertical box all content
   // at the top of the notification (to the right of the icon) except for the
   // close button.
   top_view_ = new views::View();
@@ skipping 304 matching lines @@
 }
 
 void NotificationView::ClickOnNotification() {
   message_center_->ClickOnNotification(notification_id_);
 }
 
 void NotificationView::RemoveNotification(bool by_user) {
   message_center_->RemoveNotification(notification_id_, by_user);
 }
 
-void NotificationView::DisableNotificationsFromThisSource() {
-  message_center_->DisableNotificationsByNotifier(notifier_id_);
-}
-
-void NotificationView::ShowNotifierSettingsBubble() {
-  tray_->ShowNotifierSettingsBubble();
-}
-
 bool NotificationView::IsExpansionNeeded(int width) {
   return (!is_expanded_ &&
               (image_view_ ||
                   item_views_.size() ||
                   IsMessageExpansionNeeded(width)));
 }
 
 bool NotificationView::IsMessageExpansionNeeded(int width) {
   int current = GetMessageLines(width, GetMessageLineLimit(width));
   int expanded = GetMessageLines(width,
@@ skipping 24 matching lines @@
   return message_view_ ?
          message_view_->GetLinesForWidthAndLimit(width, limit) : 0;
 }
 
 int NotificationView::GetMessageHeight(int width, int limit) {
   return message_view_ ?
          message_view_->GetSizeForWidthAndLines(width, limit).height() : 0;
 }
 
 }  // namespace message_center