| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/desktop_background/user_wallpaper_delegate.h" | 5 #include "ash/desktop_background/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 "ash/wm/window_animations.h" | 9 #include "ash/wm/window_animations.h" |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 virtual int GetAnimationType() OVERRIDE { | 27 virtual int GetAnimationType() OVERRIDE { |
| 28 return ShouldShowInitialAnimation() ? | 28 return ShouldShowInitialAnimation() ? |
| 29 ash::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE : | 29 ash::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE : |
| 30 static_cast<int>(views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE); | 30 static_cast<int>(views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE); |
| 31 } | 31 } |
| 32 | 32 |
| 33 virtual bool ShouldShowInitialAnimation() OVERRIDE { | 33 virtual bool ShouldShowInitialAnimation() OVERRIDE { |
| 34 return true; | 34 return true; |
| 35 } | 35 } |
| 36 | 36 |
| 37 virtual int GetAnimationDurationOverride() OVERRIDE { |
| 38 // Return 0 to select the default. |
| 39 return 0; |
| 40 } |
| 41 |
| 42 virtual void SetAnimationDurationOverride( |
| 43 int animation_duration_in_ms) OVERRIDE { |
| 44 NOTIMPLEMENTED(); |
| 45 } |
| 46 |
| 37 virtual void UpdateWallpaper() OVERRIDE { | 47 virtual void UpdateWallpaper() OVERRIDE { |
| 38 SkBitmap bitmap; | 48 SkBitmap bitmap; |
| 39 bitmap.setConfig(SkBitmap::kARGB_8888_Config, 16, 16); | 49 bitmap.setConfig(SkBitmap::kARGB_8888_Config, 16, 16); |
| 40 bitmap.allocPixels(); | 50 bitmap.allocPixels(); |
| 41 bitmap.eraseARGB(255, kBackgroundRed, kBackgroundGreen, kBackgroundBlue); | 51 bitmap.eraseARGB(255, kBackgroundRed, kBackgroundGreen, kBackgroundBlue); |
| 42 #if !defined(NDEBUG) | 52 #if !defined(NDEBUG) |
| 43 // In debug builds we generate a simple pattern that allows visually | 53 // In debug builds we generate a simple pattern that allows visually |
| 44 // notice if transparency is broken. | 54 // notice if transparency is broken. |
| 45 { | 55 { |
| 46 SkAutoLockPixels alp(bitmap); | 56 SkAutoLockPixels alp(bitmap); |
| (...skipping 24 matching lines...) Expand all Loading... |
| 71 | 81 |
| 72 private: | 82 private: |
| 73 DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate); | 83 DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate); |
| 74 }; | 84 }; |
| 75 | 85 |
| 76 } // namespace | 86 } // namespace |
| 77 | 87 |
| 78 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() { | 88 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() { |
| 79 return new UserWallpaperDelegate(); | 89 return new UserWallpaperDelegate(); |
| 80 } | 90 } |
| OLD | NEW |