Chromium Code Reviews| Index: ash/wm/workspace_controller.cc |
| diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc |
| index 3836a4bc38d00dcb706e0e0f05631cde34c5f9fb..e1a27c35d4b9d419d5ddacf0cffb6f2c4a19885b 100644 |
| --- a/ash/wm/workspace_controller.cc |
| +++ b/ash/wm/workspace_controller.cc |
| @@ -12,6 +12,7 @@ |
| #include "ash/common/wm/workspace/workspace_layout_manager.h" |
| #include "ash/common/wm/workspace/workspace_layout_manager_backdrop_delegate.h" |
| #include "ash/common/wm/workspace/workspace_layout_manager_delegate.h" |
| +#include "ash/common/wm_shell.h" |
| #include "ash/root_window_controller.h" |
| #include "ash/shelf/shelf_layout_manager.h" |
| #include "ash/shell.h" |
| @@ -58,9 +59,11 @@ WorkspaceController::WorkspaceController( |
| WmWindowAura::Get(viewport_)->SetLayoutManager( |
| base::WrapUnique(layout_manager_)); |
| viewport_->AddPreTargetHandler(event_handler_.get()); |
| + WmShell::Get()->AddShellObserver(layout_manager_); |
|
oshima
2016/06/18 04:47:45
can we do this in layout manager's ctor/dtor?
hidehiko
2016/06/18 05:32:45
Done.
|
| } |
| WorkspaceController::~WorkspaceController() { |
| + WmShell::Get()->RemoveShellObserver(layout_manager_); |
| viewport_->SetLayoutManager(NULL); |
| viewport_->RemovePreTargetHandler(event_handler_.get()); |
| } |