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

Side by Side Diff: ash/system/chromeos/network/tray_network.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_NETWORK_H 5 #ifndef ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
6 #define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H 6 #define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
7 7
8 #include "ash/system/chromeos/network/network_observer.h" 8 #include "ash/system/chromeos/network/network_observer.h"
9 #include "ash/system/tray/system_tray_item.h" 9 #include "ash/system/tray/system_tray_item.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 11
12 namespace ash { 12 namespace ash {
13
14 class SystemTray;
15
13 namespace internal { 16 namespace internal {
14 17
15 namespace tray { 18 namespace tray {
16 class NetworkDefaultView; 19 class NetworkDefaultView;
17 class NetworkDetailedView; 20 class NetworkDetailedView;
18 class NetworkMessages; 21 class NetworkMessages;
19 class NetworkMessageView; 22 class NetworkMessageView;
20 class NetworkNotificationView; 23 class NetworkNotificationView;
21 class NetworkTrayView; 24 class NetworkTrayView;
22 } 25 }
23 26
24 class TrayNetwork : public SystemTrayItem, 27 class TrayNetwork : public SystemTrayItem,
25 public NetworkObserver { 28 public NetworkObserver {
26 public: 29 public:
27 enum DetailedViewType { 30 enum DetailedViewType {
28 LIST_VIEW, 31 LIST_VIEW,
29 WIFI_VIEW, 32 WIFI_VIEW,
30 }; 33 };
31 34
32 TrayNetwork(); 35 explicit TrayNetwork(SystemTray* system_tray);
33 virtual ~TrayNetwork(); 36 virtual ~TrayNetwork();
34 37
35 // Overridden from SystemTrayItem. 38 // Overridden from SystemTrayItem.
36 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; 39 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
37 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 40 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
38 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 41 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
39 virtual views::View* CreateNotificationView( 42 virtual views::View* CreateNotificationView(
40 user::LoginStatus status) OVERRIDE; 43 user::LoginStatus status) OVERRIDE;
41 virtual void DestroyTrayView() OVERRIDE; 44 virtual void DestroyTrayView() OVERRIDE;
42 virtual void DestroyDefaultView() OVERRIDE; 45 virtual void DestroyDefaultView() OVERRIDE;
(...skipping 28 matching lines...) Expand all
71 scoped_ptr<tray::NetworkMessages> messages_; 74 scoped_ptr<tray::NetworkMessages> messages_;
72 bool request_wifi_view_; 75 bool request_wifi_view_;
73 76
74 DISALLOW_COPY_AND_ASSIGN(TrayNetwork); 77 DISALLOW_COPY_AND_ASSIGN(TrayNetwork);
75 }; 78 };
76 79
77 } // namespace internal 80 } // namespace internal
78 } // namespace ash 81 } // namespace ash
79 82
80 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H 83 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698