Remove confusing keyboard test & focus on input device

chrome/browser/ui/webui/chromeos/login/oobe_display_chooser.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/oobe_display_chooser.h"
 
+#include <stdint.h>
+#include <algorithm>

[oshima, 2017/07/07 14:22:10]

is this necessary?

[Felix Ekblom, 2017/07/07 19:04:30]

Removed.

+
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shell.h"
+#include "base/stl_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/display/display.h"
-#include "ui/display/display_layout.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/screen.h"
+#include "ui/events/devices/device_data_manager.h"
+#include "ui/events/devices/touchscreen_device.h"
 
 using content::BrowserThread;
 
 namespace chromeos {
 
 namespace {
 
 bool TouchSupportAvailable(const display::Display& display) {
   return display.touch_support() ==
          display::Display::TouchSupport::TOUCH_SUPPORT_AVAILABLE;
 }
 
+// TODO(felixe): More context at crbug.com/738885
+const uint16_t kDeviceIds[] = {0x0457, 0x266e};
+
 }  // namespace
 
 OobeDisplayChooser::OobeDisplayChooser() : weak_ptr_factory_(this) {}
 
 OobeDisplayChooser::~OobeDisplayChooser() {}
 
 void OobeDisplayChooser::TryToPlaceUiOnTouchDisplay() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Don't (potentially) queue a second task to run MoveToTouchDisplay if one
   // already is queued.
   if (weak_ptr_factory_.HasWeakPtrs())
     return;
 
   display::Display primary_display =
       display::Screen::GetScreen()->GetPrimaryDisplay();
 
   if (primary_display.is_valid() && !TouchSupportAvailable(primary_display)) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::BindOnce(&OobeDisplayChooser::MoveToTouchDisplay,
                        weak_ptr_factory_.GetWeakPtr()));
   }
 }
 
 void OobeDisplayChooser::MoveToTouchDisplay() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  const display::Displays& displays =
-      ash::Shell::Get()->display_manager()->active_only_display_list();
-
-  if (displays.size() <= 1)
+  if (!ui::DeviceDataManager::HasInstance())

[oshima, 2017/07/06 20:53:36]

can this happen?

[Felix Ekblom, 2017/07/07 08:41:01]

In theory, yes, since GetInstance() does not create the instance. In practice, I
don't think so but I don't know for sure.

Are you suggesting it should be safe to remove it?

[oshima, 2017/07/07 14:22:10]

If it should not happen, then remove check and fix if it happens.
Handling erroneous condition isn't recommended because it'll eventually leads to
wrong behavior anyway.

You may add DCHECK(device_manager) below to help diagnose if you want to
troubleshoot such case in bots, or local build.

[Felix Ekblom, 2017/07/07 19:04:30]

Very good point. Done.

     return;
 
-  for (const display::Display& display : displays) {
-    if (TouchSupportAvailable(display)) {
-      ash::Shell::Get()->window_tree_host_manager()->SetPrimaryDisplayId(
-          display.id());
-      break;
-    }
+  const ui::DeviceDataManager* device_manager =
+      ui::DeviceDataManager::GetInstance();
+  for (const ui::TouchscreenDevice& device :
+       device_manager->GetTouchscreenDevices()) {
+    if (!base::ContainsValue(kDeviceIds, device.vendor_id))
+      continue;
+
+    int64_t display_id =
+        device_manager->GetTargetDisplayForTouchDevice(device.id);
+    if (display_id == display::kInvalidDisplayId)
+      continue;
+
+    ash::Shell::Get()->window_tree_host_manager()->SetPrimaryDisplayId(
+        display_id);
+    break;
   }
 }
 
 }  // namespace chromeos