mash: Migrate tray IME view to wm common types, move to //ash/common

ash/common/system/tray/wm_system_tray_notifier.h

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
index 719b5fa8b5cf9affd08242efc26cbd32b0572dd8..7d3fd38dd57219f132cec6edeb352bbfbe5698db 100644
--- a/ash/common/system/tray/wm_system_tray_notifier.h
+++ b/ash/common/system/tray/wm_system_tray_notifier.h
@@ -14,9 +14,14 @@ namespace ash {
 
 class AccessibilityObserver;
 class ClockObserver;
+class IMEObserver;
 struct UpdateInfo;
 class UpdateObserver;
 
+#if defined(OS_CHROMEOS)
+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.
@@ -33,12 +38,23 @@ class ASH_EXPORT WmSystemTrayNotifier {
   void AddClockObserver(ClockObserver* observer);
   void RemoveClockObserver(ClockObserver* observer);
 
+  void AddIMEObserver(IMEObserver* observer);
+  void RemoveIMEObserver(IMEObserver* observer);
+
   void AddUpdateObserver(UpdateObserver* observer);
   void RemoveUpdateObserver(UpdateObserver* observer);
 
+#if defined(OS_CHROMEOS)
+  void AddVirtualKeyboardObserver(VirtualKeyboardObserver* observer);
+  void RemoveVirtualKeyboardObserver(VirtualKeyboardObserver* observer);
+#endif
+
   void NotifyAccessibilityModeChanged(
       AccessibilityNotificationVisibility notify);
 
+  void NotifyRefreshIME();

[msw, 2016/06/21 01:27:24]

nit: order after notify.*clock (to parallel add/remove order, ditto for impls).

[James Cook, 2016/06/21 17:31:01]

Given that I've screwed up function ordering in this file twice now, I've
reorganized it to put the notify calls next to the add/remove. This also
consolidates two of the #ifdef blocks, which seems nicer.

+  void NotifyRefreshIMEMenu(bool is_active);
+
   void NotifyRefreshClock();
   void NotifyDateFormatChanged();
   void NotifySystemClockTimeUpdated();
@@ -46,11 +62,20 @@ class ASH_EXPORT WmSystemTrayNotifier {
 
   void NotifyUpdateRecommended(const UpdateInfo& info);
 
+#if defined(OS_CHROMEOS)
+  void NotifyVirtualKeyboardSuppressionChanged(bool suppressed);
+#endif
+
  private:
   base::ObserverList<AccessibilityObserver> accessibility_observers_;
+  base::ObserverList<IMEObserver> ime_observers_;
   base::ObserverList<ClockObserver> clock_observers_;
   base::ObserverList<UpdateObserver> update_observers_;
 
+#if defined(OS_CHROMEOS)
+  base::ObserverList<VirtualKeyboardObserver> virtual_keyboard_observers_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(WmSystemTrayNotifier);
 };