mash: Convert virtual keyboard system tray item to wm common types

ash/common/wm_shell.h

Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index f850d6aeff94ef8f3eb7adc8c9f744410660b9d0..6a9632e2882ef997ea939453087b9a3c351ba0ec 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -26,6 +26,7 @@ namespace ash {
 class AccessibilityDelegate;
 class DisplayInfo;
 class FocusCycler;
+class KeyboardUI;
 class MruWindowTracker;
 class SessionStateDelegate;
 class ShellObserver;
@@ -58,6 +59,8 @@ class ASH_EXPORT WmShell {
 
   FocusCycler* focus_cycler() { return focus_cycler_.get(); }
 
+  KeyboardUI* keyboard_ui() { return keyboard_ui_.get(); }
+
   SystemTrayNotifier* system_tray_notifier() {
     return system_tray_notifier_.get();
   }
@@ -178,6 +181,8 @@ class ASH_EXPORT WmShell {
   WmShell();
   virtual ~WmShell();
 
+  void SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui);
+
   // Sets and initializes the |delegate|.
   void SetSystemTrayDelegate(std::unique_ptr<SystemTrayDelegate> delegate);
   void DeleteSystemTrayDelegate();
@@ -190,6 +195,7 @@ class ASH_EXPORT WmShell {
   static WmShell* instance_;
 
   std::unique_ptr<FocusCycler> focus_cycler_;
+  std::unique_ptr<KeyboardUI> keyboard_ui_;
   std::unique_ptr<SystemTrayNotifier> system_tray_notifier_;
   std::unique_ptr<SystemTrayDelegate> system_tray_delegate_;
   std::unique_ptr<WindowSelectorController> window_selector_controller_;