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

Side by Side Diff: ash/test/test_user_wallpaper_delegate.cc

Issue 208273005: If customization includes default wallpaper, download and apply it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after-review. Created 6 years, 8 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ash/test/test_user_wallpaper_delegate.h" 5 #include "ash/test/test_user_wallpaper_delegate.h"
6 6
7 #include "ash/desktop_background/desktop_background_controller.h" 7 #include "ash/desktop_background/desktop_background_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 9
10 namespace ash { 10 namespace ash {
11 namespace test { 11 namespace test {
12 12
13 TestUserWallpaperDelegate::TestUserWallpaperDelegate() 13 TestUserWallpaperDelegate::TestUserWallpaperDelegate()
14 : update_wallpaper_count_(0) {} 14 : update_wallpaper_count_(0) {}
15 15
16 TestUserWallpaperDelegate::~TestUserWallpaperDelegate() {} 16 TestUserWallpaperDelegate::~TestUserWallpaperDelegate() {}
17 17
18 void TestUserWallpaperDelegate::UpdateWallpaper(bool clear_cache) { 18 void TestUserWallpaperDelegate::UpdateWallpaper(bool clear_cache) {
19 DefaultUserWallpaperDelegate::UpdateWallpaper(clear_cache); 19 DefaultUserWallpaperDelegate::UpdateWallpaper(clear_cache);
20 if (!custom_wallpaper_.isNull()) { 20 if (!custom_wallpaper_.isNull()) {
21 Shell::GetInstance()->desktop_background_controller()->SetCustomWallpaper( 21 Shell::GetInstance()->desktop_background_controller()->SetWallpaper(
22 custom_wallpaper_, WALLPAPER_LAYOUT_STRETCH); 22 custom_wallpaper_, WALLPAPER_LAYOUT_STRETCH);
23 } 23 }
24 update_wallpaper_count_++; 24 update_wallpaper_count_++;
25 } 25 }
26 26
27 int TestUserWallpaperDelegate::GetUpdateWallpaperCountAndReset() { 27 int TestUserWallpaperDelegate::GetUpdateWallpaperCountAndReset() {
28 int count = update_wallpaper_count_; 28 int count = update_wallpaper_count_;
29 update_wallpaper_count_ = 0; 29 update_wallpaper_count_ = 0;
30 return count; 30 return count;
31 } 31 }
32 32
33 } // namespace test 33 } // namespace test
34 } // namespace ash 34 } // namespace ash
OLDNEW
« no previous file with comments | « ash/desktop_background/desktop_background_controller_unittest.cc ('k') | chrome/browser/chromeos/customization_document.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698