Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Side by Side Diff: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc

Issue 2314853003: Move ash::DisplayManager switches to ui::display (Closed)
Patch Set: rebased again Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
14 #include "ash/common/wallpaper/wallpaper_controller.h" 13 #include "ash/common/wallpaper/wallpaper_controller.h"
15 #include "ash/common/wm_shell.h" 14 #include "ash/common/wm_shell.h"
16 #include "ash/public/interfaces/wallpaper.mojom.h" 15 #include "ash/public/interfaces/wallpaper.mojom.h"
17 #include "base/bind.h" 16 #include "base/bind.h"
18 #include "base/bind_helpers.h" 17 #include "base/bind_helpers.h"
19 #include "base/command_line.h" 18 #include "base/command_line.h"
20 #include "base/files/file_enumerator.h" 19 #include "base/files/file_enumerator.h"
21 #include "base/files/file_path.h" 20 #include "base/files/file_path.h"
22 #include "base/files/file_util.h" 21 #include "base/files/file_util.h"
23 #include "base/logging.h" 22 #include "base/logging.h"
(...skipping 1157 matching lines...) Expand 10 before | Expand all | Expand 10 after
1181 &stored_value)) { 1180 &stored_value)) {
1182 return wallpaper::WallpaperFilesId::FromString(stored_value); 1181 return wallpaper::WallpaperFilesId::FromString(stored_value);
1183 } 1182 }
1184 const std::string& old_id = account_id.GetUserEmail(); // Migrated 1183 const std::string& old_id = account_id.GetUserEmail(); // Migrated
1185 const wallpaper::WallpaperFilesId files_id = HashWallpaperFilesIdStr(old_id); 1184 const wallpaper::WallpaperFilesId files_id = HashWallpaperFilesIdStr(old_id);
1186 SetKnownUserWallpaperFilesId(account_id, files_id); 1185 SetKnownUserWallpaperFilesId(account_id, files_id);
1187 return files_id; 1186 return files_id;
1188 } 1187 }
1189 1188
1190 } // namespace chromeos 1189 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698