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

Side by Side Diff: ash/system/tray_caps_lock.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_TRAY_CAPS_LOCK_H_ 5 #ifndef ASH_SYSTEM_TRAY_CAPS_LOCK_H_
6 #define ASH_SYSTEM_TRAY_CAPS_LOCK_H_ 6 #define ASH_SYSTEM_TRAY_CAPS_LOCK_H_
7 7
8 #include "ash/system/tray/tray_image_item.h" 8 #include "ash/system/tray/tray_image_item.h"
9 9
10 namespace views { 10 namespace views {
(...skipping 17 matching lines...) Expand all
28 28
29 class TrayCapsLock : public TrayImageItem, 29 class TrayCapsLock : public TrayImageItem,
30 public CapsLockObserver { 30 public CapsLockObserver {
31 public: 31 public:
32 TrayCapsLock(); 32 TrayCapsLock();
33 virtual ~TrayCapsLock(); 33 virtual ~TrayCapsLock();
34 34
35 private: 35 private:
36 // Overridden from TrayImageItem. 36 // Overridden from TrayImageItem.
37 virtual bool GetInitialVisibility() OVERRIDE; 37 virtual bool GetInitialVisibility() 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 DestroyDefaultView() OVERRIDE; 41 virtual void DestroyDefaultView() OVERRIDE;
41 virtual void DestroyDetailedView() OVERRIDE; 42 virtual void DestroyDetailedView() OVERRIDE;
42 43
43 // Overridden from CapsLockObserver. 44 // Overridden from CapsLockObserver.
44 virtual void OnCapsLockChanged(bool enabled, 45 virtual void OnCapsLockChanged(bool enabled,
45 bool search_mapped_to_caps_lock) OVERRIDE; 46 bool search_mapped_to_caps_lock) OVERRIDE;
46 47
47 CapsLockDefaultView* default_; 48 CapsLockDefaultView* default_;
48 views::View* detailed_; 49 views::View* detailed_;
49 50
50 bool search_mapped_to_caps_lock_; 51 bool search_mapped_to_caps_lock_;
51 bool caps_lock_enabled_; 52 bool caps_lock_enabled_;
52 bool message_shown_; 53 bool message_shown_;
53 54
54 DISALLOW_COPY_AND_ASSIGN(TrayCapsLock); 55 DISALLOW_COPY_AND_ASSIGN(TrayCapsLock);
55 }; 56 };
56 57
57 } // namespace internal 58 } // namespace internal
58 } // namespace ash 59 } // namespace ash
59 60
60 #endif // ASH_SYSTEM_TRAY_CAPS_LOCK_H_ 61 #endif // ASH_SYSTEM_TRAY_CAPS_LOCK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698