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

Side by Side Diff: ash/system/chromeos/network/tray_sms.h

Issue 11415014: Stop using shell::GetInstance()->system_tray() in system tray items (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Modified CL to provide TrayItems and Tray*Views with parent pointers instead. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_SMS_H 5 #ifndef ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_SMS_H
6 #define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_SMS_H 6 #define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_SMS_H
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ash/system/chromeos/network/sms_observer.h" 10 #include "ash/system/chromeos/network/sms_observer.h"
11 #include "ash/system/tray/system_tray_item.h" 11 #include "ash/system/tray/system_tray_item.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 13
14 namespace ash { 14 namespace ash {
15
16 class SystemTray;
17
15 namespace internal { 18 namespace internal {
16 19
17 class TraySms : public SystemTrayItem, 20 class TraySms : public SystemTrayItem,
18 public SmsObserver { 21 public SmsObserver {
19 public: 22 public:
20 TraySms(); 23 explicit TraySms(SystemTray* system_tray);
21 virtual ~TraySms(); 24 virtual ~TraySms();
22 25
23 // Overridden from SystemTrayItem. 26 // Overridden from SystemTrayItem.
24 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 27 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
25 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 28 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
26 virtual views::View* CreateNotificationView( 29 virtual views::View* CreateNotificationView(
27 user::LoginStatus status) OVERRIDE; 30 user::LoginStatus status) OVERRIDE;
28 virtual void DestroyDefaultView() OVERRIDE; 31 virtual void DestroyDefaultView() OVERRIDE;
29 virtual void DestroyDetailedView() OVERRIDE; 32 virtual void DestroyDetailedView() OVERRIDE;
30 virtual void DestroyNotificationView() OVERRIDE; 33 virtual void DestroyNotificationView() OVERRIDE;
(...skipping 25 matching lines...) Expand all
56 SmsNotificationView* notification_; 59 SmsNotificationView* notification_;
57 base::ListValue messages_; 60 base::ListValue messages_;
58 61
59 DISALLOW_COPY_AND_ASSIGN(TraySms); 62 DISALLOW_COPY_AND_ASSIGN(TraySms);
60 }; 63 };
61 64
62 } // namespace internal 65 } // namespace internal
63 } // namespace ash 66 } // namespace ash
64 67
65 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_SMS_H 68 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_SMS_H
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698