Index: ash/system/network/tray_sms.cc |
diff --git a/ash/system/network/tray_sms.cc b/ash/system/network/tray_sms.cc |
index d76b7f49a9c0da4d0899b245c2d632c19ca847a2..92beb6292b943bd944610a509ae5d279881b81ba 100644 |
--- a/ash/system/network/tray_sms.cc |
+++ b/ash/system/network/tray_sms.cc |
@@ -11,6 +11,7 @@ |
#include "ash/system/tray/tray_details_view.h" |
#include "ash/system/tray/tray_item_more.h" |
#include "ash/system/tray/tray_item_view.h" |
+#include "ash/system/tray/tray_notification_view.h" |
#include "ash/system/tray/tray_views.h" |
#include "base/command_line.h" |
#include "base/string_number_conversions.h" |
@@ -243,11 +244,10 @@ class TraySms::SmsNotificationView : public TrayNotificationView { |
size_t message_index, |
const std::string& number, |
const std::string& text) |
- : TrayNotificationView(IDR_AURA_UBER_TRAY_SMS), |
- tray_(tray), |
+ : TrayNotificationView(tray, IDR_AURA_UBER_TRAY_SMS), |
message_index_(message_index) { |
SmsMessageView* message_view = new SmsMessageView( |
- tray_, SmsMessageView::VIEW_NOTIFICATION, message_index_, number, text); |
+ tray, SmsMessageView::VIEW_NOTIFICATION, message_index_, number, text); |
InitView(message_view); |
} |
@@ -255,24 +255,25 @@ class TraySms::SmsNotificationView : public TrayNotificationView { |
const std::string& number, |
const std::string& text) { |
SmsMessageView* message_view = new SmsMessageView( |
- tray_, SmsMessageView::VIEW_NOTIFICATION, message_index_, number, text); |
+ tray_sms(), SmsMessageView::VIEW_NOTIFICATION, |
+ message_index_, number, text); |
UpdateView(message_view); |
} |
- // Overridden from views::View. |
- virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE { |
- tray_->PopupDetailedView(0, true); |
- return true; |
- } |
- |
// Overridden from TrayNotificationView: |
virtual void OnClose() OVERRIDE { |
- tray_->RemoveMessage(message_index_); |
- tray_->HideNotificationView(); |
+ tray_sms()->RemoveMessage(message_index_); |
+ } |
+ |
+ virtual void OnClickAction() OVERRIDE { |
+ tray()->PopupDetailedView(0, true); |
} |
private: |
- TraySms* tray_; |
+ TraySms* tray_sms() { |
+ return static_cast<TraySms*>(tray()); |
+ } |
+ |
size_t message_index_; |
DISALLOW_COPY_AND_ASSIGN(SmsNotificationView); |