Add ShellDelegate, MediaDelegate and KeyboardUI stubs to mus ash

ash/mus/bridge/wm_shell_mus.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/mus/bridge/wm_shell_mus.h"
 
+#include <utility>
+
 #include "ash/common/default_accessibility_delegate.h"
 #include "ash/common/display/display_info.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/shell_window_ids.h"
 #include "ash/common/system/tray/default_system_tray_delegate.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.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/window_resizer.h"
 #include "ash/common/wm_activation_observer.h"
 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
 #include "ash/mus/bridge/wm_window_mus.h"
@@ skipping 92 matching lines @@
   }
 
   ui::mojom::AccessibilityManagerPtr accessibility_manager_ptr_;
   shell::Connector* connector_;
 
   DISALLOW_COPY_AND_ASSIGN(AccessibilityDelegateMus);
 };
 
 }  // namespace
 
-WmShellMus::WmShellMus(ShellDelegate* delegate,
+WmShellMus::WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
                        ::ui::WindowTreeClient* client,
                        shell::Connector* connector)
-    : WmShell(delegate),
+    : WmShell(std::move(shell_delegate)),
       client_(client),
       connector_(connector),
       session_state_delegate_(new SessionStateDelegateStub) {
   client_->AddObserver(this);
   WmShell::Set(this);
 
   CreateMaximizeModeController();
 
   CreateMruWindowTracker();
 
   accessibility_delegate_.reset(new AccessibilityDelegateMus(connector_));
+  SetMediaDelegate(base::WrapUnique(delegate()->CreateMediaDelegate()));

[msw, 2016/07/14 19:50:05]

q: Would it make sense to move the corresponding ash::Shell init to WmShellAura?
(and similar for accessibility, etc? it'd be nice to reduce ash::Shell's duties)

[James Cook, 2016/07/14 20:54:44]

I think the right thing to do here is to have the WmShell constructor call
delegate->CreateMediaDelegate() and eliminate the SetMediaDelegate() method. I
didn't do that here because it substantially changes the ordering of
initialization of some media code in Chrome.  I'll give it a try in a follow-on
CL so it'll be easily blame-able if I break something.

[msw, 2016/07/14 20:58:04]

Acknowledged.

   SetSystemTrayDelegate(base::WrapUnique(new DefaultSystemTrayDelegate));
+
+  // TODO(jamescook): Port ash::sysui::KeyboardUIMus and use it here.
+  SetKeyboardUI(KeyboardUI::Create());
 }
 
 WmShellMus::~WmShellMus() {
   // This order mirrors that of Shell.
 
   // Destroy maximize mode controller early on since it has some observers which
   // need to be removed.
   DeleteMaximizeModeController();
   DeleteSystemTrayDelegate();
   DeleteWindowSelectorController();
@@ skipping 212 matching lines @@
                     OnWindowActivated(gained_active, lost_active));
 }
 
 void WmShellMus::OnDidDestroyClient(::ui::WindowTreeClient* client) {
   DCHECK_EQ(client, client_);
   RemoveClientObserver();
 }
 
 }  // namespace mus
 }  // namespace ash