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

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

Issue 2729363002: chromeos: Move files in //ash/common to //ash, part 3 (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « ash/test/test_system_tray_delegate.cc ('k') | ash/test/tray_cast_test_api.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_wallpaper_delegate.h" 5 #include "ash/test/test_wallpaper_delegate.h"
6 6
7 #include "ash/common/wallpaper/wallpaper_controller.h" 7 #include "ash/wallpaper/wallpaper_controller.h"
8 #include "ash/common/wm_shell.h" 8 #include "ash/wm_shell.h"
9 9
10 namespace ash { 10 namespace ash {
11 namespace test { 11 namespace test {
12 12
13 TestWallpaperDelegate::TestWallpaperDelegate() : update_wallpaper_count_(0) {} 13 TestWallpaperDelegate::TestWallpaperDelegate() : update_wallpaper_count_(0) {}
14 14
15 TestWallpaperDelegate::~TestWallpaperDelegate() {} 15 TestWallpaperDelegate::~TestWallpaperDelegate() {}
16 16
17 void TestWallpaperDelegate::UpdateWallpaper(bool clear_cache) { 17 void TestWallpaperDelegate::UpdateWallpaper(bool clear_cache) {
18 DefaultWallpaperDelegate::UpdateWallpaper(clear_cache); 18 DefaultWallpaperDelegate::UpdateWallpaper(clear_cache);
19 if (!custom_wallpaper_.isNull()) { 19 if (!custom_wallpaper_.isNull()) {
20 WmShell::Get()->wallpaper_controller()->SetWallpaperImage( 20 WmShell::Get()->wallpaper_controller()->SetWallpaperImage(
21 custom_wallpaper_, wallpaper::WALLPAPER_LAYOUT_STRETCH); 21 custom_wallpaper_, wallpaper::WALLPAPER_LAYOUT_STRETCH);
22 } 22 }
23 update_wallpaper_count_++; 23 update_wallpaper_count_++;
24 } 24 }
25 25
26 int TestWallpaperDelegate::GetUpdateWallpaperCountAndReset() { 26 int TestWallpaperDelegate::GetUpdateWallpaperCountAndReset() {
27 int count = update_wallpaper_count_; 27 int count = update_wallpaper_count_;
28 update_wallpaper_count_ = 0; 28 update_wallpaper_count_ = 0;
29 return count; 29 return count;
30 } 30 }
31 31
32 } // namespace test 32 } // namespace test
33 } // namespace ash 33 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/test_system_tray_delegate.cc ('k') | ash/test/tray_cast_test_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698