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

Side by Side Diff: ash/system/drive/tray_drive.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_DRIVE_TRAY_DRIVE_H_ 5 #ifndef ASH_SYSTEM_DRIVE_TRAY_DRIVE_H_
6 #define ASH_SYSTEM_DRIVE_TRAY_DRIVE_H_ 6 #define ASH_SYSTEM_DRIVE_TRAY_DRIVE_H_
7 7
8 #include "ash/system/drive/drive_observer.h" 8 #include "ash/system/drive/drive_observer.h"
9 #include "ash/system/tray/tray_image_item.h" 9 #include "ash/system/tray/tray_image_item.h"
10 10
11 namespace views { 11 namespace views {
12 class Label; 12 class Label;
13 } 13 }
14 14
15 namespace ash { 15 namespace ash {
16 16
17 class SystemTray;
18
17 namespace internal { 19 namespace internal {
18 20
19 namespace tray { 21 namespace tray {
20 class DriveTrayView; 22 class DriveTrayView;
21 class DriveDefaultView; 23 class DriveDefaultView;
22 class DriveDetailedView; 24 class DriveDetailedView;
23 } 25 }
24 26
25 class TrayDrive : public TrayImageItem, 27 class TrayDrive : public TrayImageItem,
26 public DriveObserver { 28 public DriveObserver {
27 public: 29 public:
28 TrayDrive(); 30 explicit TrayDrive(SystemTray* system_tray);
29 virtual ~TrayDrive(); 31 virtual ~TrayDrive();
30 32
31 private: 33 private:
32 // Overridden from TrayImageItem. 34 // Overridden from TrayImageItem.
33 virtual bool GetInitialVisibility() OVERRIDE; 35 virtual bool GetInitialVisibility() OVERRIDE;
34 36
35 // Overridden from SystemTrayItem. 37 // Overridden from SystemTrayItem.
36 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 38 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
37 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 39 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
38 virtual void DestroyDefaultView() OVERRIDE; 40 virtual void DestroyDefaultView() OVERRIDE;
(...skipping 11 matching lines...) Expand all
50 tray::DriveDefaultView* default_; 52 tray::DriveDefaultView* default_;
51 tray::DriveDetailedView* detailed_; 53 tray::DriveDetailedView* detailed_;
52 54
53 DISALLOW_COPY_AND_ASSIGN(TrayDrive); 55 DISALLOW_COPY_AND_ASSIGN(TrayDrive);
54 }; 56 };
55 57
56 } // namespace internal 58 } // namespace internal
57 } // namespace ash 59 } // namespace ash
58 60
59 #endif // ASH_SYSTEM_DRIVE_TRAY_DRIVE_H_ 61 #endif // ASH_SYSTEM_DRIVE_TRAY_DRIVE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698