Move more from WmShell to Shell

ash/aura/wm_shell_aura.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/aura/wm_shell_aura.h"
 
 #include <utility>
 
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
 #include "ash/aura/key_event_watcher_aura.h"
 #include "ash/aura/pointer_watcher_adapter.h"
 #include "ash/common/accelerators/accelerator_controller.h"
+#include "ash/common/keyboard/keyboard_ui.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm_display_observer.h"
 #include "ash/common/wm_window.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/host/ash_window_tree_host_init_params.h"
@@ skipping 185 matching lines @@
   return base::WrapUnique(new ScopedDisableInternalMouseAndKeyboardOzone);
 #endif
   return nullptr;
 }
 
 std::unique_ptr<ImmersiveFullscreenController>
 WmShellAura::CreateImmersiveFullscreenController() {
   return base::MakeUnique<ImmersiveFullscreenController>();
 }
 
+std::unique_ptr<KeyboardUI> WmShellAura::CreateKeyboardUI() {
+  return KeyboardUI::Create();
+}
+
 std::unique_ptr<KeyEventWatcher> WmShellAura::CreateKeyEventWatcher() {
   return base::MakeUnique<KeyEventWatcherAura>();
 }
 
 SessionStateDelegate* WmShellAura::GetSessionStateDelegate() {
   return Shell::GetInstance()->session_state_delegate();
 }
 
 void WmShellAura::AddDisplayObserver(WmDisplayObserver* observer) {
   if (!added_display_observer_) {
@@ skipping 71 matching lines @@
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanging();
 }
 
 void WmShellAura::OnDisplayConfigurationChanged() {
   for (auto& observer : display_observers_)
     observer.OnDisplayConfigurationChanged();
 }
 
 }  // namespace ash