| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h" | 5 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/desktop_background/user_wallpaper_delegate.h" | 8 #include "ash/desktop_background/user_wallpaper_delegate.h" |
| 9 #include "ash/wm/window_animations.h" | 9 #include "ash/wm/window_animations.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 HasSwitch(switches::kDisableBootAnimation); | 76 HasSwitch(switches::kDisableBootAnimation); |
| 77 bool disable_oobe_animation = command_line-> | 77 bool disable_oobe_animation = command_line-> |
| 78 HasSwitch(switches::kDisableOobeAnimation); | 78 HasSwitch(switches::kDisableOobeAnimation); |
| 79 if ((!is_registered && disable_oobe_animation) || | 79 if ((!is_registered && disable_oobe_animation) || |
| 80 (is_registered && disable_boot_animation)) | 80 (is_registered && disable_boot_animation)) |
| 81 return false; | 81 return false; |
| 82 | 82 |
| 83 return true; | 83 return true; |
| 84 } | 84 } |
| 85 | 85 |
| 86 virtual void UpdateWallpaper() OVERRIDE { | 86 virtual void UpdateWallpaper(bool clear_cache) OVERRIDE { |
| 87 chromeos::WallpaperManager::Get()->UpdateWallpaper(); | 87 chromeos::WallpaperManager::Get()->UpdateWallpaper(clear_cache); |
| 88 } | 88 } |
| 89 | 89 |
| 90 virtual void InitializeWallpaper() OVERRIDE { | 90 virtual void InitializeWallpaper() OVERRIDE { |
| 91 chromeos::WallpaperManager::Get()->InitializeWallpaper(); | 91 chromeos::WallpaperManager::Get()->InitializeWallpaper(); |
| 92 } | 92 } |
| 93 | 93 |
| 94 virtual void OpenSetWallpaperPage() OVERRIDE { | 94 virtual void OpenSetWallpaperPage() OVERRIDE { |
| 95 wallpaper_manager_util::OpenWallpaperManager(); | 95 wallpaper_manager_util::OpenWallpaperManager(); |
| 96 } | 96 } |
| 97 | 97 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 120 DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate); | 120 DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate); |
| 121 }; | 121 }; |
| 122 | 122 |
| 123 } // namespace | 123 } // namespace |
| 124 | 124 |
| 125 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() { | 125 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() { |
| 126 return new chromeos::UserWallpaperDelegate(); | 126 return new chromeos::UserWallpaperDelegate(); |
| 127 } | 127 } |
| 128 | 128 |
| 129 } // namespace chromeos | 129 } // namespace chromeos |
| OLD | NEW |