| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index 223438a3b710f9e38c0019c893c0813d2326ad4d..9bc79f8640b1e4eab4b41a9b7275c0123f59d3cc 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -99,6 +99,7 @@
|
| #endif
|
|
|
| #if defined(OS_CHROMEOS)
|
| +#include "ash/display/output_configurator_animation.h"
|
| #include "chromeos/display/output_configurator.h"
|
| #include "ui/aura/dispatcher_linux.h"
|
| #endif // defined(OS_CHROMEOS)
|
| @@ -190,6 +191,8 @@ Shell::Shell(ShellDelegate* delegate)
|
| ui_controls::InstallUIControlsAura(internal::CreateUIControls());
|
| #if defined(OS_CHROMEOS)
|
| // OutputConfigurator needs to get events regarding added/removed outputs.
|
| + output_configurator_->set_animation_delegate(
|
| + new internal::OutputConfiguratorAnimation);
|
| static_cast<aura::DispatcherLinux*>(
|
| aura::Env::GetInstance()->GetDispatcher())->AddDispatcherForRootWindow(
|
| output_configurator());
|
|
|