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

ash/common/wm_shell.cc

Index: ash/common/wm_shell.cc
diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc
index 4aa534e580fcae74d6ff84b133f6cdcfbf9defcb..ca9dd7937eee40ae030bf038959d54f558feee8a 100644
--- a/ash/common/wm_shell.cc
+++ b/ash/common/wm_shell.cc
@@ -5,6 +5,7 @@
 #include "ash/common/wm_shell.h"
 
 #include "ash/common/focus_cycler.h"
+#include "ash/common/keyboard/keyboard_ui.h"

[msw, 2016/06/29 01:13:47]

nit: not needed (forward decl in header should suffice?)

[James Cook, 2016/06/29 05:22:16]

It's needed to run the std::unique_ptr<KeyboardUI> destructor as part of
~WmShell().

 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
@@ -54,6 +55,10 @@ bool WmShell::IsSystemModalWindowOpen() {
   return false;
 }
 
+void WmShell::SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui) {
+  keyboard_ui_ = std::move(keyboard_ui);
+}
+
 void WmShell::SetSystemTrayDelegate(
     std::unique_ptr<SystemTrayDelegate> delegate) {
   if (delegate) {