ash/display/screen_ash.cc - Issue 2734683002: chromeos: Move files in //ash/common to //ash, part 2

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/display/screen_ash.cc

Issue 2734683002: chromeos: Move files in //ash/common to //ash, part 2 (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 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/display/screen_ash.h"	5 #include "ash/display/screen_ash.h"

6	6

7 #include "ash/common/shelf/shelf_widget.h"

8 #include "ash/common/wm/root_window_finder.h"

9 #include "ash/common/wm_window.h"	7 #include "ash/common/wm_window.h"

10 #include "ash/display/window_tree_host_manager.h"	8 #include "ash/display/window_tree_host_manager.h"

11 #include "ash/root_window_controller.h"	9 #include "ash/root_window_controller.h"

12 #include "ash/root_window_settings.h"	10 #include "ash/root_window_settings.h"

	11 #include "ash/shelf/shelf_widget.h"

13 #include "ash/shell.h"	12 #include "ash/shell.h"

	13 #include "ash/wm/root_window_finder.h"

14 #include "base/logging.h"	14 #include "base/logging.h"

15 #include "ui/aura/client/screen_position_client.h"	15 #include "ui/aura/client/screen_position_client.h"

16 #include "ui/aura/env.h"	16 #include "ui/aura/env.h"

17 #include "ui/aura/window_event_dispatcher.h"	17 #include "ui/aura/window_event_dispatcher.h"

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

19 #include "ui/display/display_finder.h"	19 #include "ui/display/display_finder.h"

20 #include "ui/display/manager/display_manager.h"	20 #include "ui/display/manager/display_manager.h"

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

22 #include "ui/display/types/display_constants.h"	22 #include "ui/display/types/display_constants.h"

23	23

(...skipping 165 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
189 }	189 }

190	190

191 // static	191 // static

192 void ScreenAsh::CreateScreenForShutdown() {	192 void ScreenAsh::CreateScreenForShutdown() {

193 delete screen_for_shutdown;	193 delete screen_for_shutdown;

194 screen_for_shutdown = new ScreenForShutdown(display::Screen::GetScreen());	194 screen_for_shutdown = new ScreenForShutdown(display::Screen::GetScreen());

195 display::Screen::SetScreenInstance(screen_for_shutdown);	195 display::Screen::SetScreenInstance(screen_for_shutdown);

196 }	196 }

197	197

198 } // namespace ash	198 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/display/root_window_transformers_unittest.cc ('k') | ash/display/screen_orientation_controller_chromeos.cc » ('j') | no next file with comments »