Fixes the context menu for a notification.

ui/message_center/views/message_view.h

 // 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.
 
 #ifndef UI_MESSAGE_CENTER_VIEWS_MESSAGE_VIEW_H_
 #define UI_MESSAGE_CENTER_VIEWS_MESSAGE_VIEW_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "ui/gfx/insets.h"
 #include "ui/message_center/message_center_export.h"
 #include "ui/message_center/notification.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/slide_out_view.h"
 
+namespace ui {
+class MenuModel;
+}
+
 namespace views {
 class ImageButton;
 class Painter;
 class ScrollView;
 }
 
 namespace message_center {
 
 // Interface that MessageView uses to report clicks and other user actions.
 // Provided by creator of MessageView.
 class MessageViewController {
  public:
   virtual void ClickOnNotification(const std::string& notification_id) = 0;
   virtual void RemoveNotification(const std::string& notification_id,
                                   bool by_user) = 0;
-  virtual void DisableNotificationsFromThisSource(
-      const NotifierId& notifier_id) = 0;
-  virtual void ShowNotifierSettingsBubble() = 0;
 };
 
-class MessageViewContextMenuController;
-
 // Individual notifications constants.
 const int kPaddingBetweenItems = 10;
 const int kPaddingHorizontal = 18;
 const int kWebNotificationButtonWidth = 32;
 const int kWebNotificationIconSize = 40;
 
 // An base class for a notification entry. Contains background, close button
 // and other elements shared by derived notification views.
 class MESSAGE_CENTER_EXPORT MessageView : public views::SlideOutView,
                                           public views::ButtonListener {
@@ skipping 28 matching lines @@
   // Overridden from ui::EventHandler:
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
 
   // Overridden from ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
   void set_scroller(views::ScrollView* scroller) { scroller_ = scroller; }
   std::string notification_id() { return notification_id_; }
   NotifierId notifier_id() { return notifier_id_; }
+  const base::string16& display_source() const { return display_source_; }
 
  protected:
   // Overridden from views::SlideOutView:
   virtual void OnSlideOut() OVERRIDE;
 
   views::ImageButton* close_button() { return close_button_.get(); }
   views::ScrollView* scroller() { return scroller_; }
 
  private:
   MessageViewController* controller_;
   std::string notification_id_;
   NotifierId notifier_id_;
-  scoped_ptr<MessageViewContextMenuController> context_menu_controller_;
   views::View* background_view_;  // Owned by views hierarchy.
   scoped_ptr<views::ImageButton> close_button_;
   views::ScrollView* scroller_;
 
   string16 accessible_name_;
 
+  base::string16 display_source_;
+
   scoped_ptr<views::Painter> focus_painter_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageView);
 };
 
 }  // namespace message_center
 
 #endif // UI_MESSAGE_CENTER_VIEWS_MESSAGE_VIEW_H_