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

Side by Side Diff: ash/system/tray/system_tray.h

Issue 9753019: ash: Add a bluetooth entry in the uber tray. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 9 months 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_SYSTEM_TRAY_H_ 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ash/ash_export.h" 9 #include "ash/ash_export.h"
10 #include "ash/system/user/login_status.h" 10 #include "ash/system/user/login_status.h"
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/memory/scoped_vector.h" 12 #include "base/memory/scoped_vector.h"
13 #include "ui/views/view.h" 13 #include "ui/views/view.h"
14 #include "ui/views/widget/widget.h" 14 #include "ui/views/widget/widget.h"
15 15
16 #include <vector> 16 #include <vector>
17 17
18 namespace ash { 18 namespace ash {
19 19
20 class AccessibilityObserver; 20 class AccessibilityObserver;
21 class AudioObserver; 21 class AudioObserver;
22 class BluetoothObserver;
22 class BrightnessObserver; 23 class BrightnessObserver;
23 class CapsLockObserver; 24 class CapsLockObserver;
24 class ClockObserver; 25 class ClockObserver;
25 class NetworkObserver; 26 class NetworkObserver;
26 class PowerStatusObserver; 27 class PowerStatusObserver;
27 class UpdateObserver; 28 class UpdateObserver;
28 class UserObserver; 29 class UserObserver;
29 30
30 class SystemTrayItem; 31 class SystemTrayItem;
31 32
(...skipping 26 matching lines...) Expand all
58 void UpdateAfterLoginStatusChange(user::LoginStatus login_status); 59 void UpdateAfterLoginStatusChange(user::LoginStatus login_status);
59 60
60 const ScopedVector<SystemTrayItem>& items() const { return items_; } 61 const ScopedVector<SystemTrayItem>& items() const { return items_; }
61 62
62 AccessibilityObserver* accessibility_observer() const { 63 AccessibilityObserver* accessibility_observer() const {
63 return accessibility_observer_; 64 return accessibility_observer_;
64 } 65 }
65 AudioObserver* audio_observer() const { 66 AudioObserver* audio_observer() const {
66 return audio_observer_; 67 return audio_observer_;
67 } 68 }
69 BluetoothObserver* bluetooth_observer() const {
70 return bluetooth_observer_;
71 }
68 BrightnessObserver* brightness_observer() const { 72 BrightnessObserver* brightness_observer() const {
69 return brightness_observer_; 73 return brightness_observer_;
70 } 74 }
71 CapsLockObserver* caps_lock_observer() const { 75 CapsLockObserver* caps_lock_observer() const {
72 return caps_lock_observer_; 76 return caps_lock_observer_;
73 } 77 }
74 ClockObserver* clock_observer() const { 78 ClockObserver* clock_observer() const {
75 return clock_observer_; 79 return clock_observer_;
76 } 80 }
77 NetworkObserver* network_observer() const { 81 NetworkObserver* network_observer() const {
(...skipping 26 matching lines...) Expand all
104 virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE; 108 virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
105 109
106 ScopedVector<SystemTrayItem> items_; 110 ScopedVector<SystemTrayItem> items_;
107 111
108 // The container for all the tray views of the items. 112 // The container for all the tray views of the items.
109 views::View* container_; 113 views::View* container_;
110 114
111 // These observers are not owned by the tray. 115 // These observers are not owned by the tray.
112 AccessibilityObserver* accessibility_observer_; 116 AccessibilityObserver* accessibility_observer_;
113 AudioObserver* audio_observer_; 117 AudioObserver* audio_observer_;
118 BluetoothObserver* bluetooth_observer_;
114 BrightnessObserver* brightness_observer_; 119 BrightnessObserver* brightness_observer_;
115 CapsLockObserver* caps_lock_observer_; 120 CapsLockObserver* caps_lock_observer_;
116 ClockObserver* clock_observer_; 121 ClockObserver* clock_observer_;
117 NetworkObserver* network_observer_; 122 NetworkObserver* network_observer_;
118 PowerStatusObserver* power_status_observer_; 123 PowerStatusObserver* power_status_observer_;
119 UpdateObserver* update_observer_; 124 UpdateObserver* update_observer_;
120 UserObserver* user_observer_; 125 UserObserver* user_observer_;
121 126
122 // The popup widget and the delegate. 127 // The popup widget and the delegate.
123 internal::SystemTrayBubble* bubble_; 128 internal::SystemTrayBubble* bubble_;
124 views::Widget* popup_; 129 views::Widget* popup_;
125 130
126 DISALLOW_COPY_AND_ASSIGN(SystemTray); 131 DISALLOW_COPY_AND_ASSIGN(SystemTray);
127 }; 132 };
128 133
129 } // namespace ash 134 } // namespace ash
130 135
131 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 136 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698