| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index 3aab8a54b33008cac7312bdc8d7b4f9e86039edb..d025e4d17520b803eaaeef575dae7852f1f8d76f 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -574,14 +574,15 @@ Shell::~Shell() {
|
| // Alphabetical.
|
| activation_controller_.reset();
|
| drag_drop_controller_.reset();
|
| + event_client_.reset();
|
| magnification_controller_.reset();
|
| + monitor_controller_.reset();
|
| + power_button_controller_.reset();
|
| resize_shadow_controller_.reset();
|
| screen_dimmer_.reset();
|
| shadow_controller_.reset();
|
| - window_cycle_controller_.reset();
|
| - event_client_.reset();
|
| - monitor_controller_.reset();
|
| tooltip_controller_.reset();
|
| + window_cycle_controller_.reset();
|
|
|
| // Launcher widget has a InputMethodBridge that references to
|
| // input_method_filter_'s input_method_. So explicitly release launcher_
|
|
|