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/common/wm/window_animation_types.h" |
7 #include "ash/desktop_background/user_wallpaper_delegate.h" | 8 #include "ash/desktop_background/user_wallpaper_delegate.h" |
8 #include "ash/shell.h" | 9 #include "ash/shell.h" |
9 #include "ash/wm/common/window_animation_types.h" | |
10 #include "ash/wm/window_animations.h" | 10 #include "ash/wm/window_animations.h" |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 #include "base/macros.h" | 13 #include "base/macros.h" |
14 #include "chrome/browser/chrome_notification_types.h" | 14 #include "chrome/browser/chrome_notification_types.h" |
15 #include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h" | 15 #include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h" |
16 #include "chrome/browser/chromeos/login/startup_utils.h" | 16 #include "chrome/browser/chromeos/login/startup_utils.h" |
17 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" | 17 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
18 #include "chrome/browser/chromeos/login/wizard_controller.h" | 18 #include "chrome/browser/chromeos/login/wizard_controller.h" |
19 #include "chromeos/chromeos_switches.h" | 19 #include "chromeos/chromeos_switches.h" |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate); | 138 DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate); |
139 }; | 139 }; |
140 | 140 |
141 } // namespace | 141 } // namespace |
142 | 142 |
143 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() { | 143 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() { |
144 return new chromeos::UserWallpaperDelegate(); | 144 return new chromeos::UserWallpaperDelegate(); |
145 } | 145 } |
146 | 146 |
147 } // namespace chromeos | 147 } // namespace chromeos |
OLD | NEW |