athena/env/athena_env_impl.cc - Issue 558253003: display: Move ui/display/types/chromeos/* to ui/display/types/*

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: athena/env/athena_env_impl.cc

Issue 558253003: display: Move ui/display/types/chromeos/* to ui/display/types/* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 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/wm/power_button_controller.cc ('k') | extensions/shell/browser/shell_desktop_controller.cc » ('j') | no next file with comments »

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 "athena/env/public/athena_env.h"	5 #include "athena/env/public/athena_env.h"

6	6

7 #include <vector>	7 #include <vector>

8	8

9 #include "athena/util/fill_layout_manager.h"	9 #include "athena/util/fill_layout_manager.h"

10 #include "base/sys_info.h"	10 #include "base/sys_info.h"

11 #include "ui/aura/client/aura_constants.h"	11 #include "ui/aura/client/aura_constants.h"

12 #include "ui/aura/client/cursor_client.h"	12 #include "ui/aura/client/cursor_client.h"

13 #include "ui/aura/client/default_capture_client.h"	13 #include "ui/aura/client/default_capture_client.h"

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

15 #include "ui/aura/test/test_screen.h"	15 #include "ui/aura/test/test_screen.h"

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

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

18 #include "ui/aura/window_tree_host_observer.h"	18 #include "ui/aura/window_tree_host_observer.h"

19 #include "ui/base/cursor/cursor.h"	19 #include "ui/base/cursor/cursor.h"

20 #include "ui/base/cursor/image_cursors.h"	20 #include "ui/base/cursor/image_cursors.h"

21 #include "ui/chromeos/user_activity_power_manager_notifier.h"	21 #include "ui/chromeos/user_activity_power_manager_notifier.h"

22 #include "ui/display/chromeos/display_configurator.h"	22 #include "ui/display/chromeos/display_configurator.h"

23 #include "ui/display/types/chromeos/display_mode.h"	23 #include "ui/display/types/display_mode.h"

24 #include "ui/display/types/chromeos/display_snapshot.h"	24 #include "ui/display/types/display_snapshot.h"

25 #include "ui/gfx/screen.h"	25 #include "ui/gfx/screen.h"

26 #include "ui/wm/core/compound_event_filter.h"	26 #include "ui/wm/core/compound_event_filter.h"

27 #include "ui/wm/core/cursor_manager.h"	27 #include "ui/wm/core/cursor_manager.h"

28 #include "ui/wm/core/input_method_event_filter.h"	28 #include "ui/wm/core/input_method_event_filter.h"

29 #include "ui/wm/core/native_cursor_manager.h"	29 #include "ui/wm/core/native_cursor_manager.h"

30 #include "ui/wm/core/native_cursor_manager_delegate.h"	30 #include "ui/wm/core/native_cursor_manager_delegate.h"

31 #include "ui/wm/core/user_activity_detector.h"	31 #include "ui/wm/core/user_activity_detector.h"

32	32

33 namespace athena {	33 namespace athena {

34	34

(...skipping 314 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
349	349

350 // static	350 // static

351	351

352 // static	352 // static

353 void AthenaEnv::Shutdown() {	353 void AthenaEnv::Shutdown() {

354 DCHECK(instance);	354 DCHECK(instance);

355 delete instance;	355 delete instance;

356 }	356 }

357	357

358 } // namespace athena	358 } // namespace athena

OLD	NEW