Chromium Code Reviews| Index: ash/shelf/shelf_layout_manager.cc |
| diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc |
| index ff95424866e43eb71462d8b27f3d071040a14ef6..1d4aeeacc37e0faf3c2c7e07c9d47ece050fe5a5 100644 |
| --- a/ash/shelf/shelf_layout_manager.cc |
| +++ b/ash/shelf/shelf_layout_manager.cc |
| @@ -261,6 +261,9 @@ ShelfLayoutManager::~ShelfLayoutManager() { |
| } |
| void ShelfLayoutManager::PrepareForShutdown() { |
| + if (in_shutdown_) |
| + return; |
| + in_shutdown_ = true; |
|
oshima
2016/05/24 20:49:10
did you actually need this? resetting/removing obs
James Cook
2016/05/24 21:18:14
I will need the in_shutdown_ variable in a future
|
| // Clear all event filters, otherwise sometimes those filters may catch |
| // synthesized mouse event and cause crashes during the shutdown. |
| set_workspace_controller(NULL); |