| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/default_user_wallpaper_delegate.h" | 5 #include "ash/default_user_wallpaper_delegate.h" |
| 6 | 6 |
| 7 #include "ash/desktop_background/desktop_background_controller.h" | 7 #include "ash/desktop_background/desktop_background_controller.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ui/wm/core/window_animations.h" | 9 #include "ui/wm/core/window_animations.h" |
| 10 | 10 |
| 11 namespace ash { | 11 namespace ash { |
| 12 | 12 |
| 13 int DefaultUserWallpaperDelegate::GetAnimationType() { | 13 int DefaultUserWallpaperDelegate::GetAnimationType() { |
| 14 return views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE; | 14 return wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE; |
| 15 } | 15 } |
| 16 | 16 |
| 17 int DefaultUserWallpaperDelegate::GetAnimationDurationOverride() { | 17 int DefaultUserWallpaperDelegate::GetAnimationDurationOverride() { |
| 18 return 0; | 18 return 0; |
| 19 } | 19 } |
| 20 | 20 |
| 21 void DefaultUserWallpaperDelegate::SetAnimationDurationOverride( | 21 void DefaultUserWallpaperDelegate::SetAnimationDurationOverride( |
| 22 int animation_duration_in_ms) { | 22 int animation_duration_in_ms) { |
| 23 } | 23 } |
| 24 | 24 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 41 return false; | 41 return false; |
| 42 } | 42 } |
| 43 | 43 |
| 44 void DefaultUserWallpaperDelegate::OnWallpaperAnimationFinished() { | 44 void DefaultUserWallpaperDelegate::OnWallpaperAnimationFinished() { |
| 45 } | 45 } |
| 46 | 46 |
| 47 void DefaultUserWallpaperDelegate::OnWallpaperBootAnimationFinished() { | 47 void DefaultUserWallpaperDelegate::OnWallpaperBootAnimationFinished() { |
| 48 } | 48 } |
| 49 | 49 |
| 50 } // namespace ash | 50 } // namespace ash |
| OLD | NEW |