ash/common/wallpaper/wallpaper_view.cc - Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3"

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/common/wallpaper/wallpaper_view.cc

Issue 2734733002: Revert "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

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/wallpaper/wallpaper_view.h"	5 #include "ash/common/wallpaper/wallpaper_view.h"

6	6

	7 #include "ash/common/session/session_state_delegate.h"

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

	9 #include "ash/common/wallpaper/wallpaper_delegate.h"

	10 #include "ash/common/wallpaper/wallpaper_widget_controller.h"

	11 #include "ash/common/wm_shell.h"

	12 #include "ash/common/wm_window.h"

7 #include "ash/root_window_controller.h"	13 #include "ash/root_window_controller.h"

8 #include "ash/session/session_state_delegate.h"

9 #include "ash/wallpaper/wallpaper_controller.h"

10 #include "ash/wallpaper/wallpaper_delegate.h"

11 #include "ash/wallpaper/wallpaper_widget_controller.h"

12 #include "ash/wm/overview/window_selector_controller.h"	14 #include "ash/wm/overview/window_selector_controller.h"

13 #include "ash/wm_shell.h"

14 #include "ash/wm_window.h"

15 #include "ui/display/display.h"	15 #include "ui/display/display.h"

16 #include "ui/display/manager/managed_display_info.h"	16 #include "ui/display/manager/managed_display_info.h"

17 #include "ui/display/screen.h"	17 #include "ui/display/screen.h"

18 #include "ui/gfx/canvas.h"	18 #include "ui/gfx/canvas.h"

19 #include "ui/gfx/geometry/safe_integer_conversions.h"	19 #include "ui/gfx/geometry/safe_integer_conversions.h"

20 #include "ui/gfx/geometry/size_conversions.h"	20 #include "ui/gfx/geometry/size_conversions.h"

21 #include "ui/gfx/transform.h"	21 #include "ui/gfx/transform.h"

22 #include "ui/views/widget/widget.h"	22 #include "ui/views/widget/widget.h"

23	23

24 namespace ash {	24 namespace ash {

(...skipping 205 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
230 // Disable animation if transition to login screen from an empty background.	230 // Disable animation if transition to login screen from an empty background.

231 wallpaper_window->SetVisibilityAnimationTransition(::wm::ANIMATE_NONE);	231 wallpaper_window->SetVisibilityAnimationTransition(::wm::ANIMATE_NONE);

232 }	232 }

233	233

234 WmWindow* container = root_window->GetChildByShellWindowId(container_id);	234 WmWindow* container = root_window->GetChildByShellWindowId(container_id);

235 wallpaper_widget->SetBounds(container->GetBounds());	235 wallpaper_widget->SetBounds(container->GetBounds());

236 return wallpaper_widget;	236 return wallpaper_widget;

237 }	237 }

238	238

239 } // namespace ash	239 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/common/wallpaper/wallpaper_view.h ('k') | ash/common/wallpaper/wallpaper_widget_controller.h » ('j') | no next file with comments »