Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(565)

Unified Diff: ash/system/tray/tray_notification_view.cc

Issue 11415014: Stop using shell::GetInstance()->system_tray() in system tray items (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed unnecessary forward declarations. Renamed |tray| to |owner|. Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/system/tray/tray_notification_view.cc
diff --git a/ash/system/tray/tray_notification_view.cc b/ash/system/tray/tray_notification_view.cc
index d787e9209cf37959b76765fbfc53ebc3a284969f..2c4929b507a3d7ae1d4677f4152746611368845d 100644
--- a/ash/system/tray/tray_notification_view.cc
+++ b/ash/system/tray/tray_notification_view.cc
@@ -23,8 +23,8 @@ const int kNotificationButtonWidth = 32;
namespace ash {
namespace internal {
-TrayNotificationView::TrayNotificationView(SystemTrayItem* tray, int icon_id)
- : tray_(tray),
+TrayNotificationView::TrayNotificationView(SystemTrayItem* owner, int icon_id)
+ : owner_(owner),
icon_id_(icon_id),
icon_(NULL) {
}
@@ -140,12 +140,12 @@ void TrayNotificationView::OnClickAction() {
}
void TrayNotificationView::OnSlideOut() {
- tray_->HideNotificationView();
+ owner_->HideNotificationView();
}
void TrayNotificationView::HandleClose() {
OnClose();
- tray_->HideNotificationView();
+ owner_->HideNotificationView();
}
void TrayNotificationView::HandleClickAction() {

Powered by Google App Engine
This is Rietveld 408576698