ash/sysui/wallpaper_delegate_mus.cc - Issue 2318223003: mash: Migrate wallpaper controllers to ash/common.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/sysui/wallpaper_delegate_mus.cc

Issue 2318223003: mash: Migrate wallpaper controllers to ash/common. (Closed)

Patch Set: Fix nit. 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/shell_unittest.cc ('k') | ash/test/test_wallpaper_delegate.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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/sysui/wallpaper_delegate_mus.h"	5 #include "ash/sysui/wallpaper_delegate_mus.h"

6	6

7 #include "ash/shell.h"	7 #include "ash/common/wallpaper/wallpaper_controller.h"

8 #include "ash/wallpaper/wallpaper_controller.h"	8 #include "ash/common/wm_shell.h"

9 #include "components/wallpaper/wallpaper_layout.h"	9 #include "components/wallpaper/wallpaper_layout.h"

10 #include "services/shell/public/cpp/connector.h"	10 #include "services/shell/public/cpp/connector.h"

11 #include "ui/views/mus/window_manager_connection.h"	11 #include "ui/views/mus/window_manager_connection.h"

12 #include "ui/wm/core/window_animations.h"	12 #include "ui/wm/core/window_animations.h"

13	13

14 namespace {	14 namespace {

15	15

16 wallpaper::WallpaperLayout WallpaperLayoutFromMojo(	16 wallpaper::WallpaperLayout WallpaperLayoutFromMojo(

17 ash::mojom::WallpaperLayout layout) {	17 ash::mojom::WallpaperLayout layout) {

18 switch (layout) {	18 switch (layout) {

(...skipping 58 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
77	77

78 void WallpaperDelegateMus::OnWallpaperAnimationFinished() {}	78 void WallpaperDelegateMus::OnWallpaperAnimationFinished() {}

79	79

80 void WallpaperDelegateMus::OnWallpaperBootAnimationFinished() {}	80 void WallpaperDelegateMus::OnWallpaperBootAnimationFinished() {}

81	81

82 void WallpaperDelegateMus::SetWallpaper(const SkBitmap& wallpaper,	82 void WallpaperDelegateMus::SetWallpaper(const SkBitmap& wallpaper,

83 mojom::WallpaperLayout layout) {	83 mojom::WallpaperLayout layout) {

84 if (wallpaper.isNull())	84 if (wallpaper.isNull())

85 return;	85 return;

86 gfx::ImageSkia image = gfx::ImageSkia::CreateFrom1xBitmap(wallpaper);	86 gfx::ImageSkia image = gfx::ImageSkia::CreateFrom1xBitmap(wallpaper);

87 Shell::GetInstance()->wallpaper_controller()->SetWallpaperImage(	87 WmShell::Get()->wallpaper_controller()->SetWallpaperImage(

88 image, WallpaperLayoutFromMojo(layout));	88 image, WallpaperLayoutFromMojo(layout));

89 }	89 }

90	90

91 } // namespace sysui	91 } // namespace sysui

92 } // namespace ash	92 } // namespace ash

OLD	NEW