| Index: ash/mus/bridge/wm_shell_mus.cc
|
| diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc
|
| index f23863e4080cffd6e8e0aeff0f78a49b85e97a99..4d72c9026b409cb153f21e4c1a3e96f3e295d430 100644
|
| --- a/ash/mus/bridge/wm_shell_mus.cc
|
| +++ b/ash/mus/bridge/wm_shell_mus.cc
|
| @@ -115,18 +115,15 @@ class SessionStateDelegateStub : public SessionStateDelegate {
|
|
|
| WmShellMus::WmShellMus(
|
| WmWindow* primary_root_window,
|
| - std::unique_ptr<ShellDelegate> shell_delegate,
|
| WindowManager* window_manager,
|
| views::PointerWatcherEventRouter* pointer_watcher_event_router,
|
| bool create_session_state_delegate_stub)
|
| - : WmShell(std::move(shell_delegate)),
|
| - window_manager_(window_manager),
|
| + : window_manager_(window_manager),
|
| primary_root_window_(primary_root_window),
|
| pointer_watcher_event_router_(pointer_watcher_event_router) {
|
| if (create_session_state_delegate_stub)
|
| session_state_delegate_ = base::MakeUnique<SessionStateDelegateStub>();
|
| DCHECK(primary_root_window_);
|
| - WmShell::Set(this);
|
|
|
| uint16_t accelerator_namespace_id = 0u;
|
| const bool add_result =
|
| @@ -146,7 +143,6 @@ WmShellMus::WmShellMus(
|
| }
|
|
|
| WmShellMus::~WmShellMus() {
|
| - WmShell::Set(nullptr);
|
| }
|
|
|
| // static
|
|
|