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

Side by Side Diff: ash/default_wallpaper_delegate.cc

Issue 2290473004: Rename ash desktop_background to wallpaper. (Closed)
Patch Set: Address comments. Created 4 years, 3 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/common/wm/overview/window_grid.cc ('k') | ash/desktop_background/DEPS » ('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/default_wallpaper_delegate.h" 5 #include "ash/default_wallpaper_delegate.h"
6 6
7 #include "ash/desktop_background/desktop_background_controller.h"
8 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/wallpaper/wallpaper_controller.h"
9 #include "ui/wm/core/window_animations.h" 9 #include "ui/wm/core/window_animations.h"
10 10
11 namespace ash { 11 namespace ash {
12 12
13 int DefaultWallpaperDelegate::GetAnimationType() { 13 int DefaultWallpaperDelegate::GetAnimationType() {
14 return ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE; 14 return ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE;
15 } 15 }
16 16
17 int DefaultWallpaperDelegate::GetAnimationDurationOverride() { 17 int DefaultWallpaperDelegate::GetAnimationDurationOverride() {
18 return 0; 18 return 0;
19 } 19 }
20 20
21 void DefaultWallpaperDelegate::SetAnimationDurationOverride( 21 void DefaultWallpaperDelegate::SetAnimationDurationOverride(
22 int animation_duration_in_ms) {} 22 int animation_duration_in_ms) {}
23 23
24 bool DefaultWallpaperDelegate::ShouldShowInitialAnimation() { 24 bool DefaultWallpaperDelegate::ShouldShowInitialAnimation() {
25 return false; 25 return false;
26 } 26 }
27 27
28 void DefaultWallpaperDelegate::UpdateWallpaper(bool clear_cache) {} 28 void DefaultWallpaperDelegate::UpdateWallpaper(bool clear_cache) {}
29 29
30 void DefaultWallpaperDelegate::InitializeWallpaper() { 30 void DefaultWallpaperDelegate::InitializeWallpaper() {
31 ash::Shell::GetInstance() 31 ash::Shell::GetInstance()->wallpaper_controller()->CreateEmptyWallpaper();
32 ->desktop_background_controller()
33 ->CreateEmptyWallpaper();
34 } 32 }
35 33
36 void DefaultWallpaperDelegate::OpenSetWallpaperPage() {} 34 void DefaultWallpaperDelegate::OpenSetWallpaperPage() {}
37 35
38 bool DefaultWallpaperDelegate::CanOpenSetWallpaperPage() { 36 bool DefaultWallpaperDelegate::CanOpenSetWallpaperPage() {
39 return false; 37 return false;
40 } 38 }
41 39
42 void DefaultWallpaperDelegate::OnWallpaperAnimationFinished() {} 40 void DefaultWallpaperDelegate::OnWallpaperAnimationFinished() {}
43 41
44 void DefaultWallpaperDelegate::OnWallpaperBootAnimationFinished() {} 42 void DefaultWallpaperDelegate::OnWallpaperBootAnimationFinished() {}
45 43
46 } // namespace ash 44 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wm/overview/window_grid.cc ('k') | ash/desktop_background/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698