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

Side by Side Diff: chrome/browser/ui/ash/user_wallpaper_delegate_win.cc

Issue 215293003: Move all wallpaper file loading and decoding from DesktopBackgroundController to WallpaperManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix clang debug build. 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
« no previous file with comments | « chrome/browser/chromeos/login/wallpaper_manager_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/desktop_background/user_wallpaper_delegate.h" 5 #include "ash/desktop_background/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 #include "ash/wm/window_animations.h" 9 #include "ash/wm/window_animations.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 bitmap.eraseARGB(255, kBackgroundRed, kBackgroundGreen, kBackgroundBlue); 51 bitmap.eraseARGB(255, kBackgroundRed, kBackgroundGreen, kBackgroundBlue);
52 #if !defined(NDEBUG) 52 #if !defined(NDEBUG)
53 // In debug builds we generate a simple pattern that allows visually 53 // In debug builds we generate a simple pattern that allows visually
54 // notice if transparency is broken. 54 // notice if transparency is broken.
55 { 55 {
56 SkAutoLockPixels alp(bitmap); 56 SkAutoLockPixels alp(bitmap);
57 *bitmap.getAddr32(0,0) = SkColorSetRGB(0, 0, 0); 57 *bitmap.getAddr32(0,0) = SkColorSetRGB(0, 0, 0);
58 } 58 }
59 #endif 59 #endif
60 gfx::ImageSkia wallpaper = gfx::ImageSkia::CreateFrom1xBitmap(bitmap); 60 gfx::ImageSkia wallpaper = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
61 ash::Shell::GetInstance()->desktop_background_controller()-> 61 ash::Shell::GetInstance()
62 SetCustomWallpaper(wallpaper, ash::WALLPAPER_LAYOUT_TILE); 62 ->desktop_background_controller()
63 ->SetWallpaperImage(wallpaper, ash::WALLPAPER_LAYOUT_TILE);
63 } 64 }
64 65
65 virtual void InitializeWallpaper() OVERRIDE { 66 virtual void InitializeWallpaper() OVERRIDE {
66 UpdateWallpaper(false); 67 UpdateWallpaper(false);
67 } 68 }
68 69
69 virtual void OpenSetWallpaperPage() OVERRIDE { 70 virtual void OpenSetWallpaperPage() OVERRIDE {
70 } 71 }
71 72
72 virtual bool CanOpenSetWallpaperPage() OVERRIDE { 73 virtual bool CanOpenSetWallpaperPage() OVERRIDE {
73 return false; 74 return false;
74 } 75 }
75 76
76 virtual void OnWallpaperAnimationFinished() OVERRIDE { 77 virtual void OnWallpaperAnimationFinished() OVERRIDE {
77 } 78 }
78 79
79 virtual void OnWallpaperBootAnimationFinished() OVERRIDE { 80 virtual void OnWallpaperBootAnimationFinished() OVERRIDE {
80 } 81 }
81 82
82 private: 83 private:
83 DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate); 84 DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate);
84 }; 85 };
85 86
86 } // namespace 87 } // namespace
87 88
88 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() { 89 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() {
89 return new UserWallpaperDelegate(); 90 return new UserWallpaperDelegate();
90 } 91 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wallpaper_manager_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698