diff options
| author | merkulova <merkulova@chromium.org> | 2015-02-18 04:16:35 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-18 12:17:13 +0000 |
| commit | 042ba9e6f314f96f237da815ae204c7f1be787c9 (patch) | |
| tree | f8947dbc3c2cc32e8ef59f763263ea8f74f7b837 /components/wallpaper | |
| parent | 37b45b61bc89e190416464634953e72b90024b98 (diff) | |
| download | chromium_src-042ba9e6f314f96f237da815ae204c7f1be787c9.zip chromium_src-042ba9e6f314f96f237da815ae204c7f1be787c9.tar.gz chromium_src-042ba9e6f314f96f237da815ae204c7f1be787c9.tar.bz2 | |
New default wallpaper used for unicorns.
BUG=433787
Review URL: https://codereview.chromium.org/925383002
Cr-Commit-Position: refs/heads/master@{#316803}
Diffstat (limited to 'components/wallpaper')
| -rw-r--r-- | components/wallpaper/wallpaper_manager_base.cc | 4 | ||||
| -rw-r--r-- | components/wallpaper/wallpaper_manager_base.h | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/components/wallpaper/wallpaper_manager_base.cc b/components/wallpaper/wallpaper_manager_base.cc index 28c7fa70..c8ef534 100644 --- a/components/wallpaper/wallpaper_manager_base.cc +++ b/components/wallpaper/wallpaper_manager_base.cc @@ -1017,6 +1017,10 @@ void WallpaperManagerBase::SetDefaultWallpaperPathsFromCommandLine( chromeos::switches::kGuestWallpaperSmall); guest_large_wallpaper_file_ = command_line->GetSwitchValuePath( chromeos::switches::kGuestWallpaperLarge); + child_small_wallpaper_file_ = command_line->GetSwitchValuePath( + chromeos::switches::kChildWallpaperSmall); + child_large_wallpaper_file_ = command_line->GetSwitchValuePath( + chromeos::switches::kChildWallpaperLarge); default_wallpaper_image_.reset(); } diff --git a/components/wallpaper/wallpaper_manager_base.h b/components/wallpaper/wallpaper_manager_base.h index 99226e8..4607466 100644 --- a/components/wallpaper/wallpaper_manager_base.h +++ b/components/wallpaper/wallpaper_manager_base.h @@ -605,6 +605,9 @@ class WALLPAPER_EXPORT WallpaperManagerBase base::FilePath guest_small_wallpaper_file_; base::FilePath guest_large_wallpaper_file_; + base::FilePath child_small_wallpaper_file_; + base::FilePath child_large_wallpaper_file_; + // Current decoded default image is stored in cache. scoped_ptr<user_manager::UserImage> default_wallpaper_image_; |