Fixes the context menu for a notification.

ui/message_center/views/message_popup_collection.cc

 // Copyright (c) 2013 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/message_popup_collection.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/screen.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_style.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_list.h"
+#include "ui/message_center/views/message_view_context_menu_controller.h"
 #include "ui/message_center/views/notification_view.h"
 #include "ui/message_center/views/toast_contents_view.h"
 #include "ui/views/background.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace message_center {
@@ skipping 25 matching lines @@
                                                MessageCenter* message_center,
                                                MessageCenterTray* tray,
                                                bool first_item_has_no_margin)
     : parent_(parent),
       message_center_(message_center),
       tray_(tray),
       defer_counter_(0),
       latest_toast_entered_(NULL),
       user_is_closing_toasts_by_clicking_(false),
       first_item_has_no_margin_(first_item_has_no_margin),
+      context_menu_controller_(new MessageViewContextMenuController(this)),
       weak_factory_(this) {
   DCHECK(message_center_);
   defer_timer_.reset(new base::OneShotTimer<MessagePopupCollection>);
   message_center_->AddObserver(this);
   gfx::Screen* screen = NULL;
   gfx::Display display;
   if (!parent_) {
     // On Win+Aura, we don't have a parent since the popups currently show up
     // on the Windows desktop, not in the Aura/Ash desktop.  This code will
     // display the popups on the primary display.
@@ skipping 28 matching lines @@
     const std::string& notification_id) {
   message_center_->ClickOnNotification(notification_id);
 }
 
 void MessagePopupCollection::RemoveNotification(
     const std::string& notification_id,
     bool by_user) {
   message_center_->RemoveNotification(notification_id, by_user);
 }
 
-void MessagePopupCollection::DisableNotificationsFromThisSource(
-    const NotifierId& notifier_id) {
-  message_center_->DisableNotificationsByNotifier(notifier_id);
-}
-
-void MessagePopupCollection::ShowNotifierSettingsBubble() {
-  tray_->ShowNotifierSettingsBubble();
+scoped_ptr<ui::MenuModel> MessagePopupCollection::CreateMenuModel(
+    const NotifierId& notifier_id,
+    const base::string16& display_source) {
+  return tray_->CreateNotificationMenuModel(notifier_id, display_source);
 }
 
 bool MessagePopupCollection::HasClickedListener(
     const std::string& notification_id) {
   return message_center_->HasClickedListener(notification_id);
 }
 
 void MessagePopupCollection::ClickOnNotificationButton(
     const std::string& notification_id,
     int button_index) {
@@ skipping 51 matching lines @@
       continue;
 
     bool expanded = true;
     if (IsExperimentalNotificationUIEnabled())
       expanded = (*iter)->is_expanded();
     NotificationView* view =
         NotificationView::Create(NULL,
                                  *(*iter),
                                  expanded,
                                  true); // Create top-level notification.
+    view->set_context_menu_controller(context_menu_controller_.get());
     int view_height = ToastContentsView::GetToastSizeForView(view).height();
     int height_available = top_down ? work_area_.bottom() - base : base;
 
     if (height_available - view_height - kToastMarginY < 0) {
       delete view;
       break;
     }
 
     ToastContentsView* toast =
         new ToastContentsView((*iter)->id(), weak_factory_.GetWeakPtr());
@@ skipping 299 matching lines @@
     const RichNotificationData& optional_fields =
         (*iter)->rich_notification_data();
     bool a11y_feedback_for_updates =
         optional_fields.should_make_spoken_feedback_for_popup_updates;
 
     NotificationView* view =
         NotificationView::Create(*toast_iter,
                                  *(*iter),
                                  expanded,
                                  true); // Create top-level notification.
+    view->set_context_menu_controller(context_menu_controller_.get());
     (*toast_iter)->SetContents(view, a11y_feedback_for_updates);
     updated = true;
   }
 
   // OnNotificationUpdated() can be called when a notification is excluded from
   // the popup notification list but still remains in the full notification
   // list. In that case the widget for the notification has to be closed here.
   if (!updated)
     RemoveToast(*toast_iter, /*mark_as_shown=*/true);
 
@@ skipping 103 matching lines @@
       views::Widget* widget = (*iter)->GetWidget();
       if (widget)
         return widget->GetWindowBoundsInScreen();
       break;
     }
   }
   return gfx::Rect();
 }
 
 }  // namespace message_center