Chromium Code Reviews| Index: remoting/host/curtain_mode_linux.cc |
| diff --git a/remoting/host/curtain_mode_linux.cc b/remoting/host/curtain_mode_linux.cc |
| index 05031bfec1b255b300d521dfde30b5686b785fa0..8ef81425a6da3708825904e4fd20394ae76be88b 100644 |
| --- a/remoting/host/curtain_mode_linux.cc |
| +++ b/remoting/host/curtain_mode_linux.cc |
| @@ -61,6 +61,7 @@ bool CurtainModeLinux::IsXvfbSession() { |
| XDeviceInfo* devices; |
| bool found_xvfb_mouse = false; |
| bool found_xvfb_keyboard = false; |
| + bool found_crd_void_input = false; |
| bool found_other_devices = false; |
| devices = XListInputDevices(display, &num_devices); |
| for (int i = 0; i < num_devices; i++) { |
| @@ -68,6 +69,9 @@ bool CurtainModeLinux::IsXvfbSession() { |
| if (device_info->use == IsXExtensionPointer) { |
| if (strcmp(device_info->name, "Xvfb mouse") == 0) { |
| found_xvfb_mouse = true; |
| + } else if (strcmp(device_info->name, |
| + "Chrome Remote Desktop Input") == 0) { |
| + found_crd_void_input = true; |
| } else if (strcmp(device_info->name, "Virtual core XTEST pointer") != 0) { |
| found_other_devices = true; |
| HOST_LOG << "Non Xvfb mouse found: " << device_info->name; |
|
Lambros
2016/05/10 00:30:15
Maybe "Non-virtual.." or "External.." or "Physical
rkjnsn
2016/05/10 20:04:07
Done.
|
| @@ -97,7 +101,8 @@ bool CurtainModeLinux::IsXvfbSession() { |
| } |
| XFreeDeviceList(devices); |
| XCloseDisplay(display); |
| - return found_xvfb_mouse && found_xvfb_keyboard && !found_other_devices; |
| + return (found_xvfb_mouse && found_xvfb_keyboard || found_crd_void_input) |
| + && !found_other_devices; |
| } |
| // static |