| Index: ash/system/tray/tray_notification_view.h
|
| diff --git a/ash/system/tray/tray_notification_view.h b/ash/system/tray/tray_notification_view.h
|
| index 259ca8a1da1d9b9027c3bbb520587f254daa930b..059e5c6525dd386faae73baf9c4e47387b5eb3df 100644
|
| --- a/ash/system/tray/tray_notification_view.h
|
| +++ b/ash/system/tray/tray_notification_view.h
|
| @@ -32,7 +32,7 @@ class TrayNotificationView : public views::SlideOutView,
|
| public:
|
| // If icon_id is 0, no icon image will be set. SetIconImage can be called
|
| // to later set the icon image.
|
| - TrayNotificationView(SystemTrayItem* tray, int icon_id);
|
| + TrayNotificationView(SystemTrayItem* owner, int icon_id);
|
| virtual ~TrayNotificationView();
|
|
|
| // InitView must be called once with the contents to be displayed.
|
| @@ -70,13 +70,13 @@ class TrayNotificationView : public views::SlideOutView,
|
| // Overridden from views::SlideOutView.
|
| virtual void OnSlideOut() OVERRIDE;
|
|
|
| - SystemTrayItem* tray() { return tray_; }
|
| + SystemTrayItem* owner() { return owner_; }
|
|
|
| private:
|
| void HandleClose();
|
| void HandleClickAction();
|
|
|
| - SystemTrayItem* tray_;
|
| + SystemTrayItem* owner_;
|
| int icon_id_;
|
| views::ImageView* icon_;
|
|
|
|
|