ash/touch/touch_transformer_controller.cc - Issue 1838833002: Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display

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

Unified Diff: ash/touch/touch_transformer_controller.cc

Issue 1838833002: Move DisplayLayout and DisplayLayoutBuilder From ash To ui/display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@screenwinmove

Patch Set: Fix comment Created 4 years, 8 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 side-by-side diff with in-line comments

Download patch

Index: ash/touch/touch_transformer_controller.cc

diff --git a/ash/touch/touch_transformer_controller.cc b/ash/touch/touch_transformer_controller.cc

index 8bea2bf5ea794911bfb26b7d28cab15716c56429..2fac6625d6c7486e2b24ef3456ce79079e23ffa7 100644

--- a/ash/touch/touch_transformer_controller.cc

+++ b/ash/touch/touch_transformer_controller.cc

@@ -11,6 +11,7 @@

#include "ash/shell.h"

#include "ui/aura/window_tree_host.h"

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

+#include "ui/display/manager/display_layout.h"

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

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

@@ -174,7 +175,7 @@ void TouchTransformerController::UpdateTouchTransformer() const {

single_display = display_manager->GetDisplayInfo(single_display_id);

UpdateTouchRadius(single_display);

} else {

- DisplayIdList list = display_manager->GetCurrentDisplayIdList();

+ display::DisplayIdList list = display_manager->GetCurrentDisplayIdList();

display1_id = list[0];

display2_id = list[1];

DCHECK(display1_id != gfx::Display::kInvalidDisplayID &&

« no previous file with comments | « ash/test/display_manager_test_api.cc ('k') | ash/wm/dock/docked_window_layout_manager_unittest.cc » ('j') | no next file with comments »