ash/touch/touch_transformer_controller.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: ash/touch/touch_transformer_controller.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/display/projecting_observer_chromeos.cc ('k') | ash/wm/power_button_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 "ash/touch/touch_transformer_controller.h"	5 #include "ash/touch/touch_transformer_controller.h"

6	6

7 #include "ash/display/display_controller.h"	7 #include "ash/display/display_controller.h"

8 #include "ash/display/display_manager.h"	8 #include "ash/display/display_manager.h"

9 #include "ash/host/ash_window_tree_host.h"	9 #include "ash/host/ash_window_tree_host.h"

10 #include "ash/root_window_controller.h"	10 #include "ash/root_window_controller.h"

11 #include "ash/shell.h"	11 #include "ash/shell.h"

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

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

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

15 #include "ui/events/device_data_manager.h"	15 #include "ui/events/device_data_manager.h"

16 #include "ui/events/x/device_data_manager_x11.h"	16 #include "ui/events/x/device_data_manager_x11.h"

17	17

18 namespace ash {	18 namespace ash {

19	19

20 namespace {	20 namespace {

21	21

22 DisplayManager* GetDisplayManager() {	22 DisplayManager* GetDisplayManager() {

23 return Shell::GetInstance()->display_manager();	23 return Shell::GetInstance()->display_manager();

24 }	24 }

(...skipping 268 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
293	293

294 void TouchTransformerController::OnDisplaysInitialized() {	294 void TouchTransformerController::OnDisplaysInitialized() {

295 UpdateTouchTransformer();	295 UpdateTouchTransformer();

296 }	296 }

297	297

298 void TouchTransformerController::OnDisplayConfigurationChanged() {	298 void TouchTransformerController::OnDisplayConfigurationChanged() {

299 UpdateTouchTransformer();	299 UpdateTouchTransformer();

300 }	300 }

301	301

302 } // namespace ash	302 } // namespace ash

OLD	NEW