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

Side by Side Diff: ash/system/brightness/tray_brightness.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_BRIGHTNESS_TRAY_BRIGHTNESS_H_ 5 #ifndef ASH_SYSTEM_BRIGHTNESS_TRAY_BRIGHTNESS_H_
6 #define ASH_SYSTEM_BRIGHTNESS_TRAY_BRIGHTNESS_H_ 6 #define ASH_SYSTEM_BRIGHTNESS_TRAY_BRIGHTNESS_H_
7 7
8 #include "ash/system/brightness/brightness_observer.h" 8 #include "ash/system/brightness/brightness_observer.h"
9 #include "ash/system/tray/system_tray_item.h" 9 #include "ash/system/tray/system_tray_item.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 17 matching lines...) Expand all
28 // can be initialized. 28 // can be initialized.
29 void GetInitialBrightness(); 29 void GetInitialBrightness();
30 30
31 // Updates |current_percent_| with the initial brightness requested by 31 // Updates |current_percent_| with the initial brightness requested by
32 // GetInitialBrightness(), if we haven't seen the brightness already in the 32 // GetInitialBrightness(), if we haven't seen the brightness already in the
33 // meantime. 33 // meantime.
34 void HandleInitialBrightness(double percent); 34 void HandleInitialBrightness(double percent);
35 35
36 // Overridden from SystemTrayItem. 36 // Overridden from SystemTrayItem.
37 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE; 37 virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
38 virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE; 38 virtual views::View* CreateDefaultView(user::LoginStatus status,
39 int bubble_width) OVERRIDE;
39 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE; 40 virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
40 virtual void DestroyTrayView() OVERRIDE; 41 virtual void DestroyTrayView() OVERRIDE;
41 virtual void DestroyDefaultView() OVERRIDE; 42 virtual void DestroyDefaultView() OVERRIDE;
42 virtual void DestroyDetailedView() OVERRIDE; 43 virtual void DestroyDetailedView() OVERRIDE;
43 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE; 44 virtual void UpdateAfterLoginStatusChange(user::LoginStatus status) OVERRIDE;
44 virtual bool ShouldShowLauncher() const OVERRIDE; 45 virtual bool ShouldShowLauncher() const OVERRIDE;
45 46
46 // Overridden from BrightnessObserver. 47 // Overridden from BrightnessObserver.
47 virtual void OnBrightnessChanged(double percent, 48 virtual void OnBrightnessChanged(double percent,
48 bool user_initiated) OVERRIDE; 49 bool user_initiated) OVERRIDE;
(...skipping 14 matching lines...) Expand all
63 // Has |current_percent_| been initialized? 64 // Has |current_percent_| been initialized?
64 bool got_current_percent_; 65 bool got_current_percent_;
65 66
66 DISALLOW_COPY_AND_ASSIGN(TrayBrightness); 67 DISALLOW_COPY_AND_ASSIGN(TrayBrightness);
67 }; 68 };
68 69
69 } // namespace internal 70 } // namespace internal
70 } // namespace ash 71 } // namespace ash
71 72
72 #endif // ASH_SYSTEM_BRIGHTNESS_TRAY_BRIGHTNESS_H_ 73 #endif // ASH_SYSTEM_BRIGHTNESS_TRAY_BRIGHTNESS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698