| Index: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h
|
| diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h
|
| index 8940f0deefd4475d80293ddadb0454bd28e2dc68..b277c10be9dba1ba47fbf25a411ae60c096bc086 100644
|
| --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h
|
| +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h
|
| @@ -8,6 +8,7 @@
|
| #include <stddef.h>
|
|
|
| #include <deque>
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| @@ -15,7 +16,6 @@
|
| #include "base/files/file_path.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted_memory.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "base/threading/sequenced_worker_pool.h"
|
| @@ -80,7 +80,7 @@ class WallpaperManager
|
| // of the JPEG |data| with a callback to SetPolicyControlledWallpaper().
|
| void OnPolicyFetched(const std::string& policy,
|
| const AccountId& account_id,
|
| - scoped_ptr<std::string> data) override;
|
| + std::unique_ptr<std::string> data) override;
|
|
|
| // Saves custom wallpaper to file, post task to generate thumbnail and updates
|
| // local state preferences. If |update_wallpaper| is false, don't change
|
| @@ -155,7 +155,7 @@ class WallpaperManager
|
| // because that's the callback interface provided by UserImageLoader.)
|
| void SetPolicyControlledWallpaper(
|
| const AccountId& account_id,
|
| - scoped_ptr<user_manager::UserImage> user_image);
|
| + std::unique_ptr<user_manager::UserImage> user_image);
|
|
|
| // Calls SetCustomWallpaper() with |wallpaper_files_id_str| received from
|
| // cryptohome.
|
| @@ -175,7 +175,7 @@ class WallpaperManager
|
| wallpaper::WallpaperLayout layout,
|
| bool update_wallpaper,
|
| wallpaper::MovableOnDestroyCallbackHolder on_finish,
|
| - scoped_ptr<user_manager::UserImage> user_image) override;
|
| + std::unique_ptr<user_manager::UserImage> user_image) override;
|
| void StartLoad(const AccountId& account_id,
|
| const wallpaper::WallpaperInfo& info,
|
| bool update_wallpaper,
|
| @@ -184,33 +184,34 @@ class WallpaperManager
|
| void SetCustomizedDefaultWallpaperAfterCheck(
|
| const GURL& wallpaper_url,
|
| const base::FilePath& downloaded_file,
|
| - scoped_ptr<CustomizedWallpaperRescaledFiles> rescaled_files) override;
|
| + std::unique_ptr<CustomizedWallpaperRescaledFiles> rescaled_files)
|
| + override;
|
| void OnCustomizedDefaultWallpaperResized(
|
| const GURL& wallpaper_url,
|
| - scoped_ptr<CustomizedWallpaperRescaledFiles> rescaled_files,
|
| - scoped_ptr<bool> success,
|
| - scoped_ptr<gfx::ImageSkia> small_wallpaper_image,
|
| - scoped_ptr<gfx::ImageSkia> large_wallpaper_image) override;
|
| + std::unique_ptr<CustomizedWallpaperRescaledFiles> rescaled_files,
|
| + std::unique_ptr<bool> success,
|
| + std::unique_ptr<gfx::ImageSkia> small_wallpaper_image,
|
| + std::unique_ptr<gfx::ImageSkia> large_wallpaper_image) override;
|
| void SetDefaultWallpaperPathsFromCommandLine(
|
| base::CommandLine* command_line) override;
|
| void OnDefaultWallpaperDecoded(
|
| const base::FilePath& path,
|
| const wallpaper::WallpaperLayout layout,
|
| - scoped_ptr<user_manager::UserImage>* result,
|
| + std::unique_ptr<user_manager::UserImage>* result,
|
| wallpaper::MovableOnDestroyCallbackHolder on_finish,
|
| - scoped_ptr<user_manager::UserImage> user_image) override;
|
| + std::unique_ptr<user_manager::UserImage> user_image) override;
|
| void StartLoadAndSetDefaultWallpaper(
|
| const base::FilePath& path,
|
| const wallpaper::WallpaperLayout layout,
|
| wallpaper::MovableOnDestroyCallbackHolder on_finish,
|
| - scoped_ptr<user_manager::UserImage>* result_out) override;
|
| + std::unique_ptr<user_manager::UserImage>* result_out) override;
|
| void SetDefaultWallpaperPath(
|
| const base::FilePath& customized_default_wallpaper_file_small,
|
| - scoped_ptr<gfx::ImageSkia> small_wallpaper_image,
|
| + std::unique_ptr<gfx::ImageSkia> small_wallpaper_image,
|
| const base::FilePath& customized_default_wallpaper_file_large,
|
| - scoped_ptr<gfx::ImageSkia> large_wallpaper_image) override;
|
| + std::unique_ptr<gfx::ImageSkia> large_wallpaper_image) override;
|
|
|
| - scoped_ptr<CrosSettings::ObserverSubscription>
|
| + std::unique_ptr<CrosSettings::ObserverSubscription>
|
| show_user_name_on_signin_subscription_;
|
|
|
| // Pointer to last inactive (waiting) entry of 'loading_' list.
|
|
|