diff options
Diffstat (limited to 'ash/wm/system_modal_container_layout_manager.h')
-rw-r--r-- | ash/wm/system_modal_container_layout_manager.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/system_modal_container_layout_manager.h b/ash/wm/system_modal_container_layout_manager.h index 309d0f07..3a0a029 100644 --- a/ash/wm/system_modal_container_layout_manager.h +++ b/ash/wm/system_modal_container_layout_manager.h @@ -52,8 +52,8 @@ class ASH_EXPORT SystemModalContainerLayoutManager // Overridden from aura::WindowObserver: virtual void OnWindowPropertyChanged(aura::Window* window, - const char* key, - void* old) OVERRIDE; + const void* key, + intptr_t old) OVERRIDE; // Overridden from ui::ImplicitAnimationObserver: virtual void OnImplicitAnimationsCompleted() OVERRIDE; |