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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/status_area_widget.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray.h
diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h
index 760c527dfb9ebd27aadfdd8d849d4ced2d923595..aa03885bf3868109116786fbb0d330a7156e6bb2 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_;
}
@@ -216,9 +220,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_;
« 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