chromeos: Remove OS ifdefs from ash/common/system/tray

ash/common/system/tray/system_tray_notifier.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_NOTIFIER_H_
 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_NOTIFIER_H_
 
 #include <string>
 
 #include "ash/ash_export.h"
 #include "ash/common/accessibility_types.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
-
-#if defined(OS_CHROMEOS)
 #include "base/strings/string16.h"
 #include "base/time/time.h"
-#endif
 
 namespace ash {
 
 class AccessibilityObserver;
+class BluetoothObserver;
 class ClockObserver;
+class EnterpriseDomainObserver;
 class IMEObserver;
-class UserObserver;
-
-#if defined(OS_CHROMEOS)
-class BluetoothObserver;
-class EnterpriseDomainObserver;
 class LastWindowClosedObserver;
 class LogoutButtonObserver;
 class NetworkObserver;
 class NetworkPortalDetectorObserver;
 class ScreenCaptureObserver;
 class ScreenShareObserver;
 class SessionLengthLimitObserver;
 class TracingObserver;
+class UserObserver;
 class VirtualKeyboardObserver;
-#endif
 
 namespace mojom {
 enum class UpdateSeverity;
 }
 
 // Observer and notification manager for the ash system tray.
 class ASH_EXPORT SystemTrayNotifier {
  public:
   SystemTrayNotifier();
   ~SystemTrayNotifier();
 
   // Accessibility.
   void AddAccessibilityObserver(AccessibilityObserver* observer);
   void RemoveAccessibilityObserver(AccessibilityObserver* observer);
   void NotifyAccessibilityModeChanged(
       AccessibilityNotificationVisibility notify);
 
+  // Bluetooth.
+  void AddBluetoothObserver(BluetoothObserver* observer);
+  void RemoveBluetoothObserver(BluetoothObserver* observer);
+  void NotifyRefreshBluetooth();
+  void NotifyBluetoothDiscoveringChanged();
+
   // Date and time.
   void AddClockObserver(ClockObserver* observer);
   void RemoveClockObserver(ClockObserver* observer);
   void NotifyRefreshClock();
   void NotifyDateFormatChanged();
   void NotifySystemClockTimeUpdated();
   void NotifySystemClockCanSetTimeChanged(bool can_set_time);
 
+  // Enterprise domain.
+  void AddEnterpriseDomainObserver(EnterpriseDomainObserver* observer);
+  void RemoveEnterpriseDomainObserver(EnterpriseDomainObserver* observer);
+  void NotifyEnterpriseDomainChanged();
+
   // Input methods.
   void AddIMEObserver(IMEObserver* observer);
   void RemoveIMEObserver(IMEObserver* observer);
   void NotifyRefreshIME();
   void NotifyRefreshIMEMenu(bool is_active);
 
-  // User.
-  void AddUserObserver(UserObserver* observer);
-  void RemoveUserObserver(UserObserver* observer);
-  void NotifyUserUpdate();
-  void NotifyUserAddedToSession();
-
-#if defined(OS_CHROMEOS)
-  // Bluetooth.
-  void AddBluetoothObserver(BluetoothObserver* observer);
-  void RemoveBluetoothObserver(BluetoothObserver* observer);
-  void NotifyRefreshBluetooth();
-  void NotifyBluetoothDiscoveringChanged();
-
-  // Enterprise domain.
-  void AddEnterpriseDomainObserver(EnterpriseDomainObserver* observer);
-  void RemoveEnterpriseDomainObserver(EnterpriseDomainObserver* observer);
-  void NotifyEnterpriseDomainChanged();
-
   // Last window closed.
   void AddLastWindowClosedObserver(LastWindowClosedObserver* observer);
   void RemoveLastWindowClosedObserver(LastWindowClosedObserver* observer);
   void NotifyLastWindowClosed();
 
   // Logout button.
   void AddLogoutButtonObserver(LogoutButtonObserver* observer);
   void RemoveLogoutButtonObserver(LogoutButtonObserver* observer);
   void NotifyShowLoginButtonChanged(bool show_login_button);
   void NotifyLogoutDialogDurationChanged(base::TimeDelta duration);
@@ skipping 28 matching lines @@
   void AddSessionLengthLimitObserver(SessionLengthLimitObserver* observer);
   void RemoveSessionLengthLimitObserver(SessionLengthLimitObserver* observer);
   void NotifySessionStartTimeChanged();
   void NotifySessionLengthLimitChanged();
 
   // Tracing.
   void AddTracingObserver(TracingObserver* observer);
   void RemoveTracingObserver(TracingObserver* observer);
   void NotifyTracingModeChanged(bool value);
 
+  // User.
+  void AddUserObserver(UserObserver* observer);
+  void RemoveUserObserver(UserObserver* observer);
+  void NotifyUserUpdate();
+  void NotifyUserAddedToSession();
+
   // Virtual keyboard.
   void AddVirtualKeyboardObserver(VirtualKeyboardObserver* observer);
   void RemoveVirtualKeyboardObserver(VirtualKeyboardObserver* observer);
   void NotifyVirtualKeyboardSuppressionChanged(bool suppressed);
-#endif
 
  private:
   base::ObserverList<AccessibilityObserver> accessibility_observers_;
+  base::ObserverList<BluetoothObserver> bluetooth_observers_;
   base::ObserverList<ClockObserver> clock_observers_;
+  base::ObserverList<EnterpriseDomainObserver> enterprise_domain_observers_;
   base::ObserverList<IMEObserver> ime_observers_;
-  base::ObserverList<UserObserver> user_observers_;
-
-#if defined(OS_CHROMEOS)
-  base::ObserverList<BluetoothObserver> bluetooth_observers_;
-  base::ObserverList<EnterpriseDomainObserver> enterprise_domain_observers_;
   base::ObserverList<LastWindowClosedObserver> last_window_closed_observers_;
   base::ObserverList<LogoutButtonObserver> logout_button_observers_;
   base::ObserverList<NetworkObserver> network_observers_;
   base::ObserverList<NetworkPortalDetectorObserver>
       network_portal_detector_observers_;
   base::ObserverList<ScreenCaptureObserver> screen_capture_observers_;
   base::ObserverList<ScreenShareObserver> screen_share_observers_;
   base::ObserverList<SessionLengthLimitObserver>
       session_length_limit_observers_;
   base::ObserverList<TracingObserver> tracing_observers_;
+  base::ObserverList<UserObserver> user_observers_;
   base::ObserverList<VirtualKeyboardObserver> virtual_keyboard_observers_;
-#endif
 
   DISALLOW_COPY_AND_ASSIGN(SystemTrayNotifier);
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_NOTIFIER_H_