| Index: ash/system/tray/system_tray_notifier.h
|
| diff --git a/ash/system/tray/system_tray_notifier.h b/ash/system/tray/system_tray_notifier.h
|
| index 1463b511f721b2fb03f86df8c4095b5746ea0c7f..14a1381222ad8e39ad5410b6b668273186075b7f 100644
|
| --- a/ash/system/tray/system_tray_notifier.h
|
| +++ b/ash/system/tray/system_tray_notifier.h
|
| @@ -13,7 +13,6 @@
|
| #include "ash/ash_export.h"
|
| #include "ash/system/audio/audio_observer.h"
|
| #include "ash/system/chromeos/tray_tracing.h"
|
| -#include "ash/system/ime/ime_observer.h"
|
| #include "ash/system/locale/locale_observer.h"
|
| #include "ash/system/user/user_observer.h"
|
| #include "base/macros.h"
|
| @@ -29,7 +28,6 @@
|
| #include "ash/system/chromeos/session/last_window_closed_observer.h"
|
| #include "ash/system/chromeos/session/logout_button_observer.h"
|
| #include "ash/system/chromeos/session/session_length_limit_observer.h"
|
| -#include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_observer.h"
|
| #include "ash/system/tray/media_security/media_capture_observer.h"
|
| #include "base/time/time.h"
|
| #endif
|
| @@ -48,9 +46,6 @@ class ASH_EXPORT SystemTrayNotifier {
|
| void AddAudioObserver(AudioObserver* observer);
|
| void RemoveAudioObserver(AudioObserver* observer);
|
|
|
| - void AddIMEObserver(IMEObserver* observer);
|
| - void RemoveIMEObserver(IMEObserver* observer);
|
| -
|
| void AddLocaleObserver(LocaleObserver* observer);
|
| void RemoveLocaleObserver(LocaleObserver* observer);
|
|
|
| @@ -92,9 +87,6 @@ class ASH_EXPORT SystemTrayNotifier {
|
|
|
| void AddLastWindowClosedObserver(LastWindowClosedObserver* observer);
|
| void RemoveLastWindowClosedObserver(LastWindowClosedObserver* observer);
|
| -
|
| - void AddVirtualKeyboardObserver(VirtualKeyboardObserver* observer);
|
| - void RemoveVirtualKeyboardObserver(VirtualKeyboardObserver* observer);
|
| #endif
|
|
|
| void NotifyAudioOutputVolumeChanged(uint64_t node_id, double volume);
|
| @@ -103,8 +95,6 @@ class ASH_EXPORT SystemTrayNotifier {
|
| void NotifyAudioActiveOutputNodeChanged();
|
| void NotifyAudioActiveInputNodeChanged();
|
| void NotifyTracingModeChanged(bool value);
|
| - void NotifyRefreshIME();
|
| - void NotifyRefreshIMEMenu(bool is_active);
|
| void NotifyLocaleChanged(LocaleObserver::Delegate* delegate,
|
| const std::string& cur_locale,
|
| const std::string& from_locale,
|
| @@ -129,12 +119,10 @@ class ASH_EXPORT SystemTrayNotifier {
|
| const base::string16& helper_name);
|
| void NotifyScreenShareStop();
|
| void NotifyLastWindowClosed();
|
| - void NotifyVirtualKeyboardSuppressionChanged(bool suppressed);
|
| #endif
|
|
|
| private:
|
| base::ObserverList<AudioObserver> audio_observers_;
|
| - base::ObserverList<IMEObserver> ime_observers_;
|
| base::ObserverList<LocaleObserver> locale_observers_;
|
| base::ObserverList<TracingObserver> tracing_observers_;
|
| base::ObserverList<UserObserver> user_observers_;
|
| @@ -151,7 +139,6 @@ class ASH_EXPORT SystemTrayNotifier {
|
| base::ObserverList<ScreenCaptureObserver> screen_capture_observers_;
|
| base::ObserverList<ScreenShareObserver> screen_share_observers_;
|
| base::ObserverList<LastWindowClosedObserver> last_window_closed_observers_;
|
| - base::ObserverList<VirtualKeyboardObserver> virtual_keyboard_observers_;
|
| #endif
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SystemTrayNotifier);
|
|
|