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

ash/common/wm_shell.cc

 // 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.
 
 #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"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm_window.h"
 #include "base/logging.h"
 
 namespace ash {
 
 // static
@@ skipping 29 matching lines @@
       continue;
     for (const WmWindow* child : system_modal->GetChildren()) {
       if (child->IsSystemModal() && child->GetTargetVisibility()) {
         return true;
       }
     }
   }
   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) {
     DCHECK(!system_tray_delegate_);
     // TODO(jamescook): Create via ShellDelegate once it moves to //ash/common.
     system_tray_delegate_ = std::move(delegate);
     system_tray_delegate_->Initialize();
   } else {
     DCHECK(system_tray_delegate_);
     system_tray_delegate_->Shutdown();
     system_tray_delegate_.reset();
   }
 }
 
 void WmShell::DeleteWindowSelectorController() {
   window_selector_controller_.reset();
 }
 
 }  // namespace ash