| Index: ash/system/tray/system_tray.h
|
| diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h
|
| index 4afbc3829267b51727ab4f312dc999f1f173beab..aae73cdd06fa659c1b5677cb89e22cdb9013c091 100644
|
| --- a/ash/system/tray/system_tray.h
|
| +++ b/ash/system/tray/system_tray.h
|
| @@ -30,11 +30,13 @@ class ClockObserver;
|
| class DriveObserver;
|
| class IMEObserver;
|
| class LocaleObserver;
|
| -class NetworkObserver;
|
| -class SmsObserver;
|
| class PowerStatusObserver;
|
| class UpdateObserver;
|
| class UserObserver;
|
| +#if defined(OS_CHROMEOS)
|
| +class NetworkObserver;
|
| +class SmsObserver;
|
| +#endif
|
|
|
| class SystemTrayItem;
|
|
|
| @@ -133,15 +135,17 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
|
| LocaleObserver* locale_observer() const {
|
| return locale_observer_;
|
| }
|
| +#if defined(OS_CHROMEOS)
|
| NetworkObserver* network_observer() const {
|
| return network_observer_;
|
| }
|
| - ObserverList<PowerStatusObserver>& power_status_observers() {
|
| - return power_status_observers_;
|
| - }
|
| SmsObserver* sms_observer() const {
|
| return sms_observer_;
|
| }
|
| +#endif
|
| + ObserverList<PowerStatusObserver>& power_status_observers() {
|
| + return power_status_observers_;
|
| + }
|
| UpdateObserver* update_observer() const {
|
| return update_observer_;
|
| }
|
| @@ -219,9 +223,11 @@ class ASH_EXPORT SystemTray : public internal::TrayBackgroundView {
|
| DriveObserver* drive_observer_;
|
| IMEObserver* ime_observer_;
|
| LocaleObserver* locale_observer_;
|
| +#if defined(OS_CHROMEOS)
|
| NetworkObserver* network_observer_;
|
| - ObserverList<PowerStatusObserver> power_status_observers_;
|
| SmsObserver* sms_observer_;
|
| +#endif
|
| + ObserverList<PowerStatusObserver> power_status_observers_;
|
| UpdateObserver* update_observer_;
|
| UserObserver* user_observer_;
|
|
|
|
|