summaryrefslogtreecommitdiffstats
path: root/ash/wm/workspace_controller.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ash/wm/workspace_controller.cc')
-rw-r--r--ash/wm/workspace_controller.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc
index 6b2a3fc..e7bba9a 100644
--- a/ash/wm/workspace_controller.cc
+++ b/ash/wm/workspace_controller.cc
@@ -76,9 +76,9 @@ void WorkspaceController::OnRootWindowResized(const gfx::Size& new_size) {
}
void WorkspaceController::OnWindowPropertyChanged(aura::Window* window,
- const char* key,
- void* old) {
- if (key == aura::client::kRootWindowActiveWindow)
+ const void* key,
+ intptr_t old) {
+ if (key == aura::client::kRootWindowActiveWindowKey)
workspace_manager_->SetActiveWorkspaceByWindow(GetActiveWindow());
}