ash/system/chromeos/network/tray_network.h - Issue 11415014: Stop using shell::GetInstance()->system_tray() in system tray items

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: 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

OLD	NEW
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"

(...skipping 16 matching lines...) Expand all Loading...
27 enum DetailedViewType {	27 enum DetailedViewType {

28 LIST_VIEW,	28 LIST_VIEW,

29 WIFI_VIEW,	29 WIFI_VIEW,

30 };	30 };

31	31

32 TrayNetwork();	32 TrayNetwork();

33 virtual ~TrayNetwork();	33 virtual ~TrayNetwork();

34	34

35 // Overridden from SystemTrayItem.	35 // Overridden from SystemTrayItem.

36 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;	36 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;

37 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;	37 virtual views::View* CreateDefaultView(user::LoginStatus status,

	38 int bubble_width) OVERRIDE;

38 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;	39 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;

39 virtual views::View* CreateNotificationView(	40 virtual views::View* CreateNotificationView(

40 user::LoginStatus status) OVERRIDE;	41 user::LoginStatus status) OVERRIDE;

41 virtual void DestroyTrayView() OVERRIDE;	42 virtual void DestroyTrayView() OVERRIDE;

42 virtual void DestroyDefaultView() OVERRIDE;	43 virtual void DestroyDefaultView() OVERRIDE;

43 virtual void DestroyDetailedView() OVERRIDE;	44 virtual void DestroyDetailedView() OVERRIDE;

44 virtual void DestroyNotificationView() OVERRIDE;	45 virtual void DestroyNotificationView() OVERRIDE;

45 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;	46 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;

46 virtual void UpdateAfterShelfAlignmentChange(	47 virtual void UpdateAfterShelfAlignmentChange(

47 ShelfAlignment alignment) OVERRIDE;	48 ShelfAlignment alignment) OVERRIDE;

(...skipping 23 matching lines...) Expand all Loading...
71 scoped_ptr<tray::NetworkMessages> messages_;	72 scoped_ptr<tray::NetworkMessages> messages_;

72 bool request_wifi_view_;	73 bool request_wifi_view_;

73	74

74 DISALLOW_COPY_AND_ASSIGN(TrayNetwork);	75 DISALLOW_COPY_AND_ASSIGN(TrayNetwork);

75 };	76 };

76	77

77 } // namespace internal	78 } // namespace internal

78 } // namespace ash	79 } // namespace ash

79	80

80 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H	81 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H

OLD	NEW

« no previous file with comments | « ash/system/brightness/tray_brightness.cc ('k') | ash/system/chromeos/network/tray_network.cc » ('j') | ash/system/tray/system_tray_item.h » ('J')