OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_H_ |
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_H_ | 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_H_ |
7 | 7 |
8 #include <deque> | 8 #include <deque> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 23 matching lines...) Expand all Loading... |
34 } | 34 } |
35 | 35 |
36 namespace user_manager { | 36 namespace user_manager { |
37 class User; | 37 class User; |
38 class UserImage; | 38 class UserImage; |
39 } | 39 } |
40 | 40 |
41 namespace chromeos { | 41 namespace chromeos { |
42 | 42 |
43 struct WallpaperInfo { | 43 struct WallpaperInfo { |
44 // Online wallpaper URL or file name of migrated wallpaper. | 44 // Either file name of migrated wallpaper including first directory level |
45 std::string file; | 45 // (corresponding to user id hash) or online wallpaper URL. |
| 46 std::string location; |
46 ash::WallpaperLayout layout; | 47 ash::WallpaperLayout layout; |
47 user_manager::User::WallpaperType type; | 48 user_manager::User::WallpaperType type; |
48 base::Time date; | 49 base::Time date; |
49 bool operator==(const WallpaperInfo& other) { | 50 bool operator==(const WallpaperInfo& other) { |
50 return (file == other.file) && (layout == other.layout) && | 51 return (location == other.location) && (layout == other.layout) && |
51 (type == other.type); | 52 (type == other.type); |
52 } | 53 } |
53 }; | 54 }; |
54 | 55 |
55 class MovableOnDestroyCallback; | 56 class MovableOnDestroyCallback; |
56 typedef scoped_ptr<MovableOnDestroyCallback> MovableOnDestroyCallbackHolder; | 57 typedef scoped_ptr<MovableOnDestroyCallback> MovableOnDestroyCallbackHolder; |
57 | 58 |
58 class WallpaperManagerBrowserTest; | 59 class WallpaperManagerBrowserTest; |
59 | 60 |
60 // Name of wallpaper sequence token. | 61 // Name of wallpaper sequence token. |
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
625 | 626 |
626 // Current decoded default image is stored in cache. | 627 // Current decoded default image is stored in cache. |
627 scoped_ptr<user_manager::UserImage> default_wallpaper_image_; | 628 scoped_ptr<user_manager::UserImage> default_wallpaper_image_; |
628 | 629 |
629 DISALLOW_COPY_AND_ASSIGN(WallpaperManager); | 630 DISALLOW_COPY_AND_ASSIGN(WallpaperManager); |
630 }; | 631 }; |
631 | 632 |
632 } // namespace chromeos | 633 } // namespace chromeos |
633 | 634 |
634 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_H_ | 635 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_WALLPAPER_WALLPAPER_MANAGER_H_ |
OLD | NEW |