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/desktop_background/user_wallpaper_delegate.h" | 7 #include "ash/desktop_background/user_wallpaper_delegate.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/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/macros.h" |
12 #include "chrome/browser/chrome_notification_types.h" | 13 #include "chrome/browser/chrome_notification_types.h" |
13 #include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h" | 14 #include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h" |
14 #include "chrome/browser/chromeos/login/startup_utils.h" | 15 #include "chrome/browser/chromeos/login/startup_utils.h" |
15 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" | 16 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
16 #include "chrome/browser/chromeos/login/wizard_controller.h" | 17 #include "chrome/browser/chromeos/login/wizard_controller.h" |
17 #include "chromeos/chromeos_switches.h" | 18 #include "chromeos/chromeos_switches.h" |
18 #include "chromeos/login/login_state.h" | 19 #include "chromeos/login/login_state.h" |
19 #include "components/user_manager/user.h" | 20 #include "components/user_manager/user.h" |
20 #include "components/user_manager/user_manager.h" | 21 #include "components/user_manager/user_manager.h" |
21 #include "content/public/browser/notification_service.h" | 22 #include "content/public/browser/notification_service.h" |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate); | 137 DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate); |
137 }; | 138 }; |
138 | 139 |
139 } // namespace | 140 } // namespace |
140 | 141 |
141 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() { | 142 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() { |
142 return new chromeos::UserWallpaperDelegate(); | 143 return new chromeos::UserWallpaperDelegate(); |
143 } | 144 } |
144 | 145 |
145 } // namespace chromeos | 146 } // namespace chromeos |
OLD | NEW |