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

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

Issue 10582028: Re-factor TraySms to use ash::SmsObserver instead of NetoworkSmsHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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/network/tray_sms.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 #pragma once 7 #pragma once
8 8
9 #include "ash/ash_export.h" 9 #include "ash/ash_export.h"
10 #include "ash/system/power/power_supply_status.h" 10 #include "ash/system/power/power_supply_status.h"
(...skipping 14 matching lines...) Expand all
25 class AccessibilityObserver; 25 class AccessibilityObserver;
26 class AudioObserver; 26 class AudioObserver;
27 class BluetoothObserver; 27 class BluetoothObserver;
28 class BrightnessObserver; 28 class BrightnessObserver;
29 class CapsLockObserver; 29 class CapsLockObserver;
30 class ClockObserver; 30 class ClockObserver;
31 class DriveObserver; 31 class DriveObserver;
32 class IMEObserver; 32 class IMEObserver;
33 class LocaleObserver; 33 class LocaleObserver;
34 class NetworkObserver; 34 class NetworkObserver;
35 class SmsObserver;
35 class PowerStatusObserver; 36 class PowerStatusObserver;
36 class UpdateObserver; 37 class UpdateObserver;
37 class UserObserver; 38 class UserObserver;
38 39
39 class SystemTrayItem; 40 class SystemTrayItem;
40 41
41 namespace internal { 42 namespace internal {
42 class SystemTrayBubble; 43 class SystemTrayBubble;
43 class SystemTrayContainer; 44 class SystemTrayContainer;
44 class SystemTrayLayerAnimationObserver; 45 class SystemTrayLayerAnimationObserver;
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 } 134 }
134 LocaleObserver* locale_observer() const { 135 LocaleObserver* locale_observer() const {
135 return locale_observer_; 136 return locale_observer_;
136 } 137 }
137 NetworkObserver* network_observer() const { 138 NetworkObserver* network_observer() const {
138 return network_observer_; 139 return network_observer_;
139 } 140 }
140 ObserverList<PowerStatusObserver>& power_status_observers() { 141 ObserverList<PowerStatusObserver>& power_status_observers() {
141 return power_status_observers_; 142 return power_status_observers_;
142 } 143 }
144 SmsObserver* sms_observer() const {
145 return sms_observer_;
146 }
143 UpdateObserver* update_observer() const { 147 UpdateObserver* update_observer() const {
144 return update_observer_; 148 return update_observer_;
145 } 149 }
146 UserObserver* user_observer() const { 150 UserObserver* user_observer() const {
147 return user_observer_; 151 return user_observer_;
148 } 152 }
149 153
150 // Accessors for testing. 154 // Accessors for testing.
151 155
152 // Returns true if the bubble exists. 156 // Returns true if the bubble exists.
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 AudioObserver* audio_observer_; 225 AudioObserver* audio_observer_;
222 BluetoothObserver* bluetooth_observer_; 226 BluetoothObserver* bluetooth_observer_;
223 BrightnessObserver* brightness_observer_; 227 BrightnessObserver* brightness_observer_;
224 CapsLockObserver* caps_lock_observer_; 228 CapsLockObserver* caps_lock_observer_;
225 ClockObserver* clock_observer_; 229 ClockObserver* clock_observer_;
226 DriveObserver* drive_observer_; 230 DriveObserver* drive_observer_;
227 IMEObserver* ime_observer_; 231 IMEObserver* ime_observer_;
228 LocaleObserver* locale_observer_; 232 LocaleObserver* locale_observer_;
229 NetworkObserver* network_observer_; 233 NetworkObserver* network_observer_;
230 ObserverList<PowerStatusObserver> power_status_observers_; 234 ObserverList<PowerStatusObserver> power_status_observers_;
235 SmsObserver* sms_observer_;
231 UpdateObserver* update_observer_; 236 UpdateObserver* update_observer_;
232 UserObserver* user_observer_; 237 UserObserver* user_observer_;
233 238
234 // Bubble for default and detailed views. 239 // Bubble for default and detailed views.
235 scoped_ptr<internal::SystemTrayBubble> bubble_; 240 scoped_ptr<internal::SystemTrayBubble> bubble_;
236 241
237 // Buble for notifications. 242 // Buble for notifications.
238 scoped_ptr<internal::SystemTrayBubble> notification_bubble_; 243 scoped_ptr<internal::SystemTrayBubble> notification_bubble_;
239 244
240 // See description agove getter. 245 // See description agove getter.
241 bool should_show_launcher_; 246 bool should_show_launcher_;
242 247
243 scoped_ptr<internal::SystemTrayLayerAnimationObserver> 248 scoped_ptr<internal::SystemTrayLayerAnimationObserver>
244 layer_animation_observer_; 249 layer_animation_observer_;
245 250
246 // Keep track of the default view height so that when we create detailed 251 // Keep track of the default view height so that when we create detailed
247 // views directly (e.g. from a notification) we know what height to use. 252 // views directly (e.g. from a notification) we know what height to use.
248 int default_bubble_height_; 253 int default_bubble_height_;
249 254
250 // Set to true when system notifications should be hidden (e.g. web 255 // Set to true when system notifications should be hidden (e.g. web
251 // notification bubble is visible). 256 // notification bubble is visible).
252 bool hide_notifications_; 257 bool hide_notifications_;
253 258
254 DISALLOW_COPY_AND_ASSIGN(SystemTray); 259 DISALLOW_COPY_AND_ASSIGN(SystemTray);
255 }; 260 };
256 261
257 } // namespace ash 262 } // namespace ash
258 263
259 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ 264 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_
OLDNEW
« no previous file with comments | « ash/system/network/tray_sms.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698