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

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: 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
(...skipping 15 matching lines...) Expand all
26 public DriveObserver { 26 public DriveObserver {
27 public: 27 public:
28 TrayDrive(); 28 TrayDrive();
29 virtual ~TrayDrive(); 29 virtual ~TrayDrive();
30 30
31 private: 31 private:
32 // Overridden from TrayImageItem. 32 // Overridden from TrayImageItem.
33 virtual bool GetInitialVisibility() OVERRIDE; 33 virtual bool GetInitialVisibility() OVERRIDE;
34 34
35 // Overridden from SystemTrayItem. 35 // Overridden from SystemTrayItem.
36 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 36 virtual views::View* CreateDefaultView(user::LoginStatus status,
37 int bubble_width) OVERRIDE;
37 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 38 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
38 virtual void DestroyDefaultView() OVERRIDE; 39 virtual void DestroyDefaultView() OVERRIDE;
39 virtual void DestroyDetailedView() OVERRIDE; 40 virtual void DestroyDetailedView() OVERRIDE;
40 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 41 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
41 42
42 // Overridden from DriveObserver. 43 // Overridden from DriveObserver.
43 virtual void OnDriveRefresh(const DriveOperationStatusList& list) OVERRIDE; 44 virtual void OnDriveRefresh(const DriveOperationStatusList& list) OVERRIDE;
44 45
45 // Delayed re-check of the status after encounter operation depleted list. 46 // Delayed re-check of the status after encounter operation depleted list.
46 void OnStatusCheck(); 47 void OnStatusCheck();
47 48
48 void UpdateTrayIcon(bool show); 49 void UpdateTrayIcon(bool show);
49 50
50 tray::DriveDefaultView* default_; 51 tray::DriveDefaultView* default_;
51 tray::DriveDetailedView* detailed_; 52 tray::DriveDetailedView* detailed_;
52 53
53 DISALLOW_COPY_AND_ASSIGN(TrayDrive); 54 DISALLOW_COPY_AND_ASSIGN(TrayDrive);
54 }; 55 };
55 56
56 } // namespace internal 57 } // namespace internal
57 } // namespace ash 58 } // namespace ash
58 59
59 #endif // ASH_SYSTEM_DRIVE_TRAY_DRIVE_H_ 60 #endif // ASH_SYSTEM_DRIVE_TRAY_DRIVE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698