Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2090)

Unified Diff: ash/wm/workspace_controller.cc

Issue 2072853002: Implement "pinned" mode in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix linux build breakage Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/wm/workspace_controller.cc
diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc
index 3836a4bc38d00dcb706e0e0f05631cde34c5f9fb..e0c0be2ca095682539624db61a8d4bcb5bab525c 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,11 +59,13 @@ WorkspaceController::WorkspaceController(
WmWindowAura::Get(viewport_)->SetLayoutManager(
base::WrapUnique(layout_manager_));
viewport_->AddPreTargetHandler(event_handler_.get());
+ WmShell::Get()->AddShellObserver(layout_manager_);
}
WorkspaceController::~WorkspaceController() {
- viewport_->SetLayoutManager(NULL);
+ WmShell::Get()->RemoveShellObserver(layout_manager_);
viewport_->RemovePreTargetHandler(event_handler_.get());
oshima 2016/06/17 10:56:51 is there any reason for this reorder?
hidehiko 2016/06/17 17:19:22 In sane manner, the order of callback unregistrati
+ viewport_->SetLayoutManager(NULL);
}
wm::WorkspaceWindowState WorkspaceController::GetWindowState() const {
« ash/wm/pinned_controller_unittest.cc ('K') | « ash/wm/workspace/workspace_layout_manager_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698