| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index 20f464dd964a61c1398d8ef4c4699f8db3499582..7669aabe589c663b27d0e77cc7e508e4d792aba4 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -49,6 +49,7 @@
|
| #include "ash/shell_factory.h"
|
| #include "ash/shell_init_params.h"
|
| #include "ash/shell_window_ids.h"
|
| +#include "ash/surfaces/surface_controller.h"
|
| #include "ash/system/locale/locale_notification_controller.h"
|
| #include "ash/system/status_area_widget.h"
|
| #include "ash/system/tray/system_tray_delegate.h"
|
| @@ -654,6 +655,7 @@ Shell::Shell(ShellDelegate* delegate, base::SequencedWorkerPool* blocking_pool)
|
| display_manager_.reset(new DisplayManager);
|
| window_tree_host_manager_.reset(new WindowTreeHostManager);
|
| user_metrics_recorder_.reset(new UserMetricsRecorder);
|
| + surface_controller_.reset(new SurfaceController);
|
|
|
| #if defined(OS_CHROMEOS)
|
| PowerStatus::Initialize();
|
| @@ -793,6 +795,8 @@ Shell::~Shell() {
|
| power_button_controller_.reset();
|
| lock_state_controller_.reset();
|
|
|
| + surface_controller_.reset();
|
| +
|
| #if defined(OS_CHROMEOS)
|
| resolution_notification_controller_.reset();
|
| #endif
|
|
|