| 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 "chrome/browser/chromeos/login/wallpaper_manager.h" | 5 #include "chrome/browser/chromeos/login/wallpaper_manager.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 848 | 848 |
| 849 if (UserManager::Get()->IsUserNonCryptohomeDataEphemeral(email)) { | 849 if (UserManager::Get()->IsUserNonCryptohomeDataEphemeral(email)) { |
| 850 // Default to the values cached in memory. | 850 // Default to the values cached in memory. |
| 851 *info = current_user_wallpaper_info_; | 851 *info = current_user_wallpaper_info_; |
| 852 | 852 |
| 853 // Ephemeral users do not save anything to local state. But we have got | 853 // Ephemeral users do not save anything to local state. But we have got |
| 854 // wallpaper info from memory. Returns true. | 854 // wallpaper info from memory. Returns true. |
| 855 return true; | 855 return true; |
| 856 } | 856 } |
| 857 | 857 |
| 858 const DictionaryValue* user_wallpapers = g_browser_process->local_state()-> | 858 const base::DictionaryValue* user_wallpapers = |
| 859 GetDictionary(prefs::kUsersWallpaperInfo); | 859 g_browser_process->local_state()-> |
| 860 GetDictionary(prefs::kUsersWallpaperInfo); |
| 860 const base::DictionaryValue* wallpaper_info_dict; | 861 const base::DictionaryValue* wallpaper_info_dict; |
| 861 if (user_wallpapers->GetDictionaryWithoutPathExpansion( | 862 if (user_wallpapers->GetDictionaryWithoutPathExpansion( |
| 862 email, &wallpaper_info_dict)) { | 863 email, &wallpaper_info_dict)) { |
| 863 info->file = ""; | 864 info->file = ""; |
| 864 info->layout = ash::WALLPAPER_LAYOUT_CENTER_CROPPED; | 865 info->layout = ash::WALLPAPER_LAYOUT_CENTER_CROPPED; |
| 865 info->type = User::UNKNOWN; | 866 info->type = User::UNKNOWN; |
| 866 info->date = base::Time::Now().LocalMidnight(); | 867 info->date = base::Time::Now().LocalMidnight(); |
| 867 wallpaper_info_dict->GetString(kNewWallpaperFileNodeName, &(info->file)); | 868 wallpaper_info_dict->GetString(kNewWallpaperFileNodeName, &(info->file)); |
| 868 int temp; | 869 int temp; |
| 869 wallpaper_info_dict->GetInteger(kNewWallpaperLayoutNodeName, &temp); | 870 wallpaper_info_dict->GetInteger(kNewWallpaperLayoutNodeName, &temp); |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1078 | 1079 |
| 1079 wallpaper_loader_->Start(wallpaper_path.value(), 0, | 1080 wallpaper_loader_->Start(wallpaper_path.value(), 0, |
| 1080 base::Bind(&WallpaperManager::OnWallpaperDecoded, | 1081 base::Bind(&WallpaperManager::OnWallpaperDecoded, |
| 1081 base::Unretained(this), | 1082 base::Unretained(this), |
| 1082 email, | 1083 email, |
| 1083 info.layout, | 1084 info.layout, |
| 1084 update_wallpaper)); | 1085 update_wallpaper)); |
| 1085 } | 1086 } |
| 1086 | 1087 |
| 1087 } // namespace chromeos | 1088 } // namespace chromeos |
| OLD | NEW |