Chromium Code Reviews| Index: ash/shell.cc |
| diff --git a/ash/shell.cc b/ash/shell.cc |
| index b125026a023ffa6df99bcc96acd7f8af20541ce2..7cd6cf1fd51470b38bd27feea6d0f1111da3521c 100644 |
| --- a/ash/shell.cc |
| +++ b/ash/shell.cc |
| @@ -806,6 +806,8 @@ Shell::~Shell() { |
| } |
| void Shell::Init(const ShellInitParams& init_params) { |
| + wm_shell_->Initialize(); |
| + |
| in_mus_ = init_params.in_mus; |
|
msw
2016/07/14 22:49:34
aside: hopefully WmShell Init delegates won't rely
James Cook
2016/07/14 22:52:51
Yeah, all this startup ordering stuff is hard. I t
|
| #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| @@ -1017,8 +1019,6 @@ void Shell::Init(const ShellInitParams& init_params) { |
| accessibility_delegate_.reset( |
| wm_shell_->delegate()->CreateAccessibilityDelegate()); |
| new_window_delegate_.reset(wm_shell_->delegate()->CreateNewWindowDelegate()); |
| - wm_shell_->SetMediaDelegate( |
| - base::WrapUnique(wm_shell_->delegate()->CreateMediaDelegate())); |
| pointer_watcher_delegate_ = |
| wm_shell_->delegate()->CreatePointerWatcherDelegate(); |