| 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 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" | 5 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 #include <numeric> | 8 #include <numeric> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "ash/common/ash_constants.h" | 12 #include "ash/common/ash_constants.h" |
| 13 #include "ash/common/ash_switches.h" | 13 #include "ash/common/ash_switches.h" |
| 14 #include "ash/desktop_background/desktop_background_controller.h" |
| 14 #include "ash/shell.h" | 15 #include "ash/shell.h" |
| 15 #include "base/bind.h" | 16 #include "base/bind.h" |
| 16 #include "base/command_line.h" | 17 #include "base/command_line.h" |
| 17 #include "base/files/file_enumerator.h" | 18 #include "base/files/file_enumerator.h" |
| 18 #include "base/files/file_path.h" | 19 #include "base/files/file_path.h" |
| 19 #include "base/files/file_util.h" | 20 #include "base/files/file_util.h" |
| 20 #include "base/logging.h" | 21 #include "base/logging.h" |
| 21 #include "base/macros.h" | 22 #include "base/macros.h" |
| 22 #include "base/metrics/histogram.h" | 23 #include "base/metrics/histogram.h" |
| 23 #include "base/path_service.h" | 24 #include "base/path_service.h" |
| (...skipping 1148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1172 &stored_value)) { | 1173 &stored_value)) { |
| 1173 return wallpaper::WallpaperFilesId::FromString(stored_value); | 1174 return wallpaper::WallpaperFilesId::FromString(stored_value); |
| 1174 } | 1175 } |
| 1175 const std::string& old_id = account_id.GetUserEmail(); // Migrated | 1176 const std::string& old_id = account_id.GetUserEmail(); // Migrated |
| 1176 const wallpaper::WallpaperFilesId files_id = HashWallpaperFilesIdStr(old_id); | 1177 const wallpaper::WallpaperFilesId files_id = HashWallpaperFilesIdStr(old_id); |
| 1177 SetKnownUserWallpaperFilesId(account_id, files_id); | 1178 SetKnownUserWallpaperFilesId(account_id, files_id); |
| 1178 return files_id; | 1179 return files_id; |
| 1179 } | 1180 } |
| 1180 | 1181 |
| 1181 } // namespace chromeos | 1182 } // namespace chromeos |
| OLD | NEW |