ash/touch/touch_transformer_controller.cc - Issue 1638413007: Use list instead of pair to represent the set of displays.

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 1638413007: Use list instead of pair to represent the set of displays. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix build error Created 4 years, 11 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

« ash/shelf/shelf_layout_manager.cc ('K') | « ash/sticky_keys/sticky_keys_overlay_unittest.cc ('k') | chrome/browser/chromeos/display/display_preferences.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/touch/touch_transformer_controller.cc

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

index 0af8c8d86e4f6aa5a307ca04f170f9bb45d64f24..8bea2bf5ea794911bfb26b7d28cab15716c56429 100644

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

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

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

single_display = display_manager->GetDisplayInfo(single_display_id);

UpdateTouchRadius(single_display);

} else {

- DisplayIdPair id_pair = display_manager->GetCurrentDisplayIdPair();

- display1_id = id_pair.first;

- display2_id = id_pair.second;

+ DisplayIdList list = display_manager->GetCurrentDisplayIdList();

+ display1_id = list[0];

+ display2_id = list[1];

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

display2_id != gfx::Display::kInvalidDisplayID);

display1 = display_manager->GetDisplayInfo(display1_id);

« ash/shelf/shelf_layout_manager.cc ('K') | « ash/sticky_keys/sticky_keys_overlay_unittest.cc ('k') | chrome/browser/chromeos/display/display_preferences.cc » ('j') | no next file with comments »