ash/touch/touch_transformer_controller.cc - Issue 1107733006: Unified Desktop: hook up ash to allow unified desktop mode

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 1107733006: Unified Desktop: hook up ash to allow unified desktop mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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

« ash/host/ash_window_tree_host_virtual.cc ('K') | « ash/system/web_notification/web_notification_tray_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 d2582c027a3bf1980f3c10b3a990a4108b22de57..269450e4791b6f4297241292d61cf4742be7ac93 100644

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

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

@@ -142,7 +142,8 @@ void TouchTransformerController::UpdateTouchTransformer() const {

DisplayManager* display_manager = GetDisplayManager();

if (display_manager->num_connected_displays() == 0) {

return;

- } else if (display_manager->num_connected_displays() == 1) {

+ } else if (display_manager->num_connected_displays() == 1 ||

+ display_manager->multi_display_mode() == DisplayManager::UNIFIED) {

single_display_id = display_manager->first_display_id();

DCHECK(single_display_id != gfx::Display::kInvalidDisplayID);

single_display = display_manager->GetDisplayInfo(single_display_id);