summaryrefslogtreecommitdiffstats
path: root/ash/wm/workspace_controller.h
diff options
context:
space:
mode:
Diffstat (limited to 'ash/wm/workspace_controller.h')
-rw-r--r--ash/wm/workspace_controller.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/workspace_controller.h b/ash/wm/workspace_controller.h
index b6998c5..7ea212b 100644
--- a/ash/wm/workspace_controller.h
+++ b/ash/wm/workspace_controller.h
@@ -60,8 +60,8 @@ class ASH_EXPORT WorkspaceController :
// aura::WindowObserver overrides:
virtual void OnWindowPropertyChanged(aura::Window* window,
- const char* key,
- void* old) OVERRIDE;
+ const void* key,
+ intptr_t old) OVERRIDE;
// ui::SimpleMenuModel::Delegate overrides:
virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;