| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index d27375286d401f7311253e72430dbec0c9d784c5..d3b19197b4b57628c162577e6925f8346705f154 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -566,6 +566,7 @@ Shell::~Shell() {
|
|
|
| // The system tray needs to be reset before all the windows are destroyed.
|
| tray_.reset();
|
| + tray_delegate_.reset();
|
|
|
| // Desroy secondary monitor's widgets before all the windows are destroyed.
|
| monitor_controller_.reset();
|
| @@ -588,6 +589,7 @@ Shell::~Shell() {
|
| window_cycle_controller_.reset();
|
| event_client_.reset();
|
| monitor_controller_.reset();
|
| + tooltip_controller_.reset();
|
|
|
| // Launcher widget has a InputMethodBridge that references to
|
| // input_method_filter_'s input_method_. So explicitly release launcher_
|
|
|