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

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

Issue 11039034: Move ash/system/network to ash/system/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 2 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
« no previous file with comments | « ash/system/status_area_widget.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/system/power/power_supply_status.h" 9 #include "ash/system/power/power_supply_status.h"
10 #include "ash/system/tray/tray_background_view.h" 10 #include "ash/system/tray/tray_background_view.h"
(...skipping 12 matching lines...) Expand all
23 23
24 class AccessibilityObserver; 24 class AccessibilityObserver;
25 class AudioObserver; 25 class AudioObserver;
26 class BluetoothObserver; 26 class BluetoothObserver;
27 class BrightnessObserver; 27 class BrightnessObserver;
28 class CapsLockObserver; 28 class CapsLockObserver;
29 class ClockObserver; 29 class ClockObserver;
30 class DriveObserver; 30 class DriveObserver;
31 class IMEObserver; 31 class IMEObserver;
32 class LocaleObserver; 32 class LocaleObserver;
33 class NetworkObserver;
34 class SmsObserver;
35 class PowerStatusObserver; 33 class PowerStatusObserver;
36 class UpdateObserver; 34 class UpdateObserver;
37 class UserObserver; 35 class UserObserver;
36 #if defined(OS_CHROMEOS)
37 class NetworkObserver;
38 class SmsObserver;
39 #endif
38 40
39 class SystemTrayItem; 41 class SystemTrayItem;
40 42
41 namespace internal { 43 namespace internal {
42 class SystemTrayBubble; 44 class SystemTrayBubble;
43 class SystemTrayContainer; 45 class SystemTrayContainer;
44 class TrayGestureHandler; 46 class TrayGestureHandler;
45 } 47 }
46 48
47 // There are different methods for creating bubble views. 49 // There are different methods for creating bubble views.
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 } 128 }
127 DriveObserver* drive_observer() const { 129 DriveObserver* drive_observer() const {
128 return drive_observer_; 130 return drive_observer_;
129 } 131 }
130 IMEObserver* ime_observer() const { 132 IMEObserver* ime_observer() const {
131 return ime_observer_; 133 return ime_observer_;
132 } 134 }
133 LocaleObserver* locale_observer() const { 135 LocaleObserver* locale_observer() const {
134 return locale_observer_; 136 return locale_observer_;
135 } 137 }
138 #if defined(OS_CHROMEOS)
136 NetworkObserver* network_observer() const { 139 NetworkObserver* network_observer() const {
137 return network_observer_; 140 return network_observer_;
138 } 141 }
139 ObserverList<PowerStatusObserver>& power_status_observers() {
140 return power_status_observers_;
141 }
142 SmsObserver* sms_observer() const { 142 SmsObserver* sms_observer() const {
143 return sms_observer_; 143 return sms_observer_;
144 } 144 }
145 #endif
146 ObserverList<PowerStatusObserver>& power_status_observers() {
147 return power_status_observers_;
148 }
145 UpdateObserver* update_observer() const { 149 UpdateObserver* update_observer() const {
146 return update_observer_; 150 return update_observer_;
147 } 151 }
148 UserObserver* user_observer() const { 152 UserObserver* user_observer() const {
149 return user_observer_; 153 return user_observer_;
150 } 154 }
151 155
152 // Accessors for testing. 156 // Accessors for testing.
153 157
154 // Returns true if the bubble exists. 158 // Returns true if the bubble exists.
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 // These observers are not owned by the tray. 213 // These observers are not owned by the tray.
210 AccessibilityObserver* accessibility_observer_; 214 AccessibilityObserver* accessibility_observer_;
211 AudioObserver* audio_observer_; 215 AudioObserver* audio_observer_;
212 BluetoothObserver* bluetooth_observer_; 216 BluetoothObserver* bluetooth_observer_;
213 BrightnessObserver* brightness_observer_; 217 BrightnessObserver* brightness_observer_;
214 CapsLockObserver* caps_lock_observer_; 218 CapsLockObserver* caps_lock_observer_;
215 ClockObserver* clock_observer_; 219 ClockObserver* clock_observer_;
216 DriveObserver* drive_observer_; 220 DriveObserver* drive_observer_;
217 IMEObserver* ime_observer_; 221 IMEObserver* ime_observer_;
218 LocaleObserver* locale_observer_; 222 LocaleObserver* locale_observer_;
223 #if defined(OS_CHROMEOS)
219 NetworkObserver* network_observer_; 224 NetworkObserver* network_observer_;
225 SmsObserver* sms_observer_;
226 #endif
220 ObserverList<PowerStatusObserver> power_status_observers_; 227 ObserverList<PowerStatusObserver> power_status_observers_;
221 SmsObserver* sms_observer_;
222 UpdateObserver* update_observer_; 228 UpdateObserver* update_observer_;
223 UserObserver* user_observer_; 229 UserObserver* user_observer_;
224 230
225 // Bubble for default and detailed views. 231 // Bubble for default and detailed views.
226 scoped_ptr<internal::SystemTrayBubble> bubble_; 232 scoped_ptr<internal::SystemTrayBubble> bubble_;
227 233
228 // Bubble for notifications. 234 // Bubble for notifications.
229 scoped_ptr<internal::SystemTrayBubble> notification_bubble_; 235 scoped_ptr<internal::SystemTrayBubble> notification_bubble_;
230 236
231 // Keep track of the default view height so that when we create detailed 237 // Keep track of the default view height so that when we create detailed
232 // views directly (e.g. from a notification) we know what height to use. 238 // views directly (e.g. from a notification) we know what height to use.
233 int default_bubble_height_; 239 int default_bubble_height_;
234 240
235 // Set to true when system notifications should be hidden (e.g. web 241 // Set to true when system notifications should be hidden (e.g. web
236 // notification bubble is visible). 242 // notification bubble is visible).
237 bool hide_notifications_; 243 bool hide_notifications_;
238 244
239 DISALLOW_COPY_AND_ASSIGN(SystemTray); 245 DISALLOW_COPY_AND_ASSIGN(SystemTray);
240 }; 246 };
241 247
242 } // namespace ash 248 } // namespace ash
243 249
244 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 250 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/status_area_widget.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698