| Index: ash/display/display_manager.cc
|
| diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc
|
| index 449a65ac23b9e35aeac63ac55ef998c0097a8cec..b731ded75629bb985b260d201867de780c7edb0c 100644
|
| --- a/ash/display/display_manager.cc
|
| +++ b/ash/display/display_manager.cc
|
| @@ -1068,8 +1068,10 @@ bool DisplayManager::UpdateDisplayBounds(int64 display_id,
|
| }
|
|
|
| void DisplayManager::CreateMirrorWindowAsyncIfAny() {
|
| - // Do not post a task if the software mirroring doesn't exist.
|
| - if (!HasSoftwareMirroringDisplay())
|
| + // Do not post a task if the software mirroring doesn't exist, or
|
| + // during initialization when compositor's init task isn't posted yet.
|
| + // ash::Shell::Init() will call this after the compositor is initialized.
|
| + if (!HasSoftwareMirroringDisplay() || !delegate_)
|
| return;
|
| base::MessageLoopForUI::current()->PostTask(
|
| FROM_HERE,
|
|
|