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

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

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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>
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 #include "components/user_manager/user.h" 54 #include "components/user_manager/user.h"
55 #include "components/user_manager/user_image/user_image.h" 55 #include "components/user_manager/user_image/user_image.h"
56 #include "components/user_manager/user_manager.h" 56 #include "components/user_manager/user_manager.h"
57 #include "components/user_manager/user_type.h" 57 #include "components/user_manager/user_type.h"
58 #include "components/wallpaper/wallpaper_files_id.h" 58 #include "components/wallpaper/wallpaper_files_id.h"
59 #include "components/wallpaper/wallpaper_layout.h" 59 #include "components/wallpaper/wallpaper_layout.h"
60 #include "content/public/browser/browser_thread.h" 60 #include "content/public/browser/browser_thread.h"
61 #include "content/public/browser/notification_service.h" 61 #include "content/public/browser/notification_service.h"
62 #include "content/public/common/content_switches.h" 62 #include "content/public/common/content_switches.h"
63 #include "content/public/common/service_manager_connection.h" 63 #include "content/public/common/service_manager_connection.h"
64 #include "services/shell/public/cpp/connector.h" 64 #include "services/service_manager/public/cpp/connector.h"
65 #include "third_party/skia/include/core/SkColor.h" 65 #include "third_party/skia/include/core/SkColor.h"
66 #include "ui/gfx/codec/jpeg_codec.h" 66 #include "ui/gfx/codec/jpeg_codec.h"
67 #include "ui/gfx/image/image_skia_operations.h" 67 #include "ui/gfx/image/image_skia_operations.h"
68 #include "ui/gfx/skia_util.h" 68 #include "ui/gfx/skia_util.h"
69 69
70 using content::BrowserThread; 70 using content::BrowserThread;
71 using wallpaper::WallpaperManagerBase; 71 using wallpaper::WallpaperManagerBase;
72 using wallpaper::WallpaperInfo; 72 using wallpaper::WallpaperInfo;
73 using wallpaper::MovableOnDestroyCallback; 73 using wallpaper::MovableOnDestroyCallback;
74 using wallpaper::MovableOnDestroyCallbackHolder; 74 using wallpaper::MovableOnDestroyCallbackHolder;
(...skipping 1107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1182 &stored_value)) { 1182 &stored_value)) {
1183 return wallpaper::WallpaperFilesId::FromString(stored_value); 1183 return wallpaper::WallpaperFilesId::FromString(stored_value);
1184 } 1184 }
1185 const std::string& old_id = account_id.GetUserEmail(); // Migrated 1185 const std::string& old_id = account_id.GetUserEmail(); // Migrated
1186 const wallpaper::WallpaperFilesId files_id = HashWallpaperFilesIdStr(old_id); 1186 const wallpaper::WallpaperFilesId files_id = HashWallpaperFilesIdStr(old_id);
1187 SetKnownUserWallpaperFilesId(account_id, files_id); 1187 SetKnownUserWallpaperFilesId(account_id, files_id);
1188 return files_id; 1188 return files_id;
1189 } 1189 }
1190 1190
1191 } // namespace chromeos 1191 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698