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

Unified Diff: ash/common/system/tray/wm_system_tray_notifier.h

Issue 2098023002: mash: Migrate remaining tray observers and notify functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 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 side-by-side diff with in-line comments
Download patch
Index: ash/common/system/tray/wm_system_tray_notifier.h
diff --git a/ash/common/system/tray/wm_system_tray_notifier.h b/ash/common/system/tray/wm_system_tray_notifier.h
deleted file mode 100644
index 4410f53534da7f233de35dbb464e9076ba484ef3..0000000000000000000000000000000000000000
--- a/ash/common/system/tray/wm_system_tray_notifier.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// 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_WM_SYSTEM_TRAY_NOTIFIER_H_
-#define ASH_COMMON_SYSTEM_TRAY_WM_SYSTEM_TRAY_NOTIFIER_H_
-
-#include "ash/ash_export.h"
-#include "ash/common/accessibility_types.h"
-#include "ash/common/system/locale/locale_observer.h"
-#include "base/macros.h"
-#include "base/observer_list.h"
-
-namespace ash {
-
-class AccessibilityObserver;
-class AudioObserver;
-class ClockObserver;
-class IMEObserver;
-struct UpdateInfo;
-class UpdateObserver;
-
-#if defined(OS_CHROMEOS)
-class TracingObserver;
-class VirtualKeyboardObserver;
-#endif
-
-// Observer and notification manager for the ash system tray. This version
-// contains the observers that have been ported to //ash/common. See also
-// ash::SystemTrayNotifier.
-// TODO(jamescook): After all the observers have been moved, rename this class
-// to SystemTrayNotifier.
-class ASH_EXPORT WmSystemTrayNotifier {
- public:
- WmSystemTrayNotifier();
- ~WmSystemTrayNotifier();
-
- // Accessibility.
- void AddAccessibilityObserver(AccessibilityObserver* observer);
- void RemoveAccessibilityObserver(AccessibilityObserver* observer);
- void NotifyAccessibilityModeChanged(
- AccessibilityNotificationVisibility notify);
-
- // Audio.
- void AddAudioObserver(AudioObserver* observer);
- void RemoveAudioObserver(AudioObserver* observer);
- void NotifyAudioOutputVolumeChanged(uint64_t node_id, double volume);
- void NotifyAudioOutputMuteChanged(bool mute_on, bool system_adjust);
- void NotifyAudioNodesChanged();
- void NotifyAudioActiveOutputNodeChanged();
- void NotifyAudioActiveInputNodeChanged();
-
- // Date and time.
- void AddClockObserver(ClockObserver* observer);
- void RemoveClockObserver(ClockObserver* observer);
- void NotifyRefreshClock();
- void NotifyDateFormatChanged();
- void NotifySystemClockTimeUpdated();
- void NotifySystemClockCanSetTimeChanged(bool can_set_time);
-
- // Input methods.
- void AddIMEObserver(IMEObserver* observer);
- void RemoveIMEObserver(IMEObserver* observer);
- void NotifyRefreshIME();
- void NotifyRefreshIMEMenu(bool is_active);
-
- // Locale.
- void AddLocaleObserver(LocaleObserver* observer);
- void RemoveLocaleObserver(LocaleObserver* observer);
- void NotifyLocaleChanged(LocaleObserver::Delegate* delegate,
- const std::string& cur_locale,
- const std::string& from_locale,
- const std::string& to_locale);
-
- // OS updates.
- void AddUpdateObserver(UpdateObserver* observer);
- void RemoveUpdateObserver(UpdateObserver* observer);
- void NotifyUpdateRecommended(const UpdateInfo& info);
-
-#if defined(OS_CHROMEOS)
- // Tracing.
- void AddTracingObserver(TracingObserver* observer);
- void RemoveTracingObserver(TracingObserver* observer);
- void NotifyTracingModeChanged(bool value);
-
- // Virtual keyboard.
- void AddVirtualKeyboardObserver(VirtualKeyboardObserver* observer);
- void RemoveVirtualKeyboardObserver(VirtualKeyboardObserver* observer);
- void NotifyVirtualKeyboardSuppressionChanged(bool suppressed);
-#endif
-
- private:
- base::ObserverList<AccessibilityObserver> accessibility_observers_;
- base::ObserverList<AudioObserver> audio_observers_;
- base::ObserverList<ClockObserver> clock_observers_;
- base::ObserverList<IMEObserver> ime_observers_;
- base::ObserverList<LocaleObserver> locale_observers_;
- base::ObserverList<UpdateObserver> update_observers_;
-
-#if defined(OS_CHROMEOS)
- base::ObserverList<TracingObserver> tracing_observers_;
- base::ObserverList<VirtualKeyboardObserver> virtual_keyboard_observers_;
-#endif
-
- DISALLOW_COPY_AND_ASSIGN(WmSystemTrayNotifier);
-};
-
-} // namespace ash
-
-#endif // ASH_COMMON_SYSTEM_TRAY_WM_SYSTEM_TRAY_NOTIFIER_H_

Powered by Google App Engine
This is Rietveld 408576698