Put OOBE UI on touch display if no keyboard detected

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

+// Copyright (c) 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 "ash/display/display_configuration_controller.h"
+#include "ash/shell.h"
+#include "ui/display/display.h"
+#include "ui/display/manager/display_manager.h"
+#include "ui/display/screen.h"
+
+namespace chromeos {
+
+namespace {
+
+bool TouchSupportAvailable(const display::Display& display) {
+  return display.touch_support() ==
+         display::Display::TouchSupport::TOUCH_SUPPORT_AVAILABLE;
+}
+
+}  // namespace
+
+// static
+std::unique_ptr<OobeDisplayChooser> OobeDisplayChooser::CreateDefault() {
+  return base::MakeUnique<OobeDisplayChooser>(
+      ash::Shell::Get()->display_configuration_controller(),
+      ash::Shell::Get()->display_manager(), display::Screen::GetScreen());
+}
+
+OobeDisplayChooser::OobeDisplayChooser(
+    ash::DisplayConfigurationController* configuration_controller,
+    display::DisplayManager* display_manager,
+    display::Screen* screen)
+    : configuration_controller_(configuration_controller),
+      display_manager_(display_manager),
+      screen_(screen) {}

[oshima, 2017/05/09 05:58:45]

Just getting these from Shell in the methods below would be simpler.

[Felix Ekblom, 2017/05/09 08:54:50]

Yes, fixed now. I was hoping to mock them for the unit tests but it turned out I
had to use AshTestbase, making this unnecessary.

+
+OobeDisplayChooser::~OobeDisplayChooser() {}
+
+void OobeDisplayChooser::TryToPlaceUIOnTouchDisplay() {

[jdufault, 2017/05/08 17:44:57]

nit: UI -> Ui

+  auto primary_display = screen_->GetPrimaryDisplay();

[jdufault, 2017/05/08 17:44:58]

nit: auto type is not obvious

+  if (primary_display.is_valid() && !TouchSupportAvailable(primary_display)) {
+    MoveToTouchDisplay();

[jdufault, 2017/05/08 17:44:58]

nit: drop {}

+  }
+}
+
+void OobeDisplayChooser::OnDisplayAdded(const display::Display& new_display) {

[jdufault, 2017/05/08 17:44:57]

|new_display| is never used, so remove this function and call
TryToPlaceUiOnTouchDisplay directly

+  TryToPlaceUIOnTouchDisplay();
+}
+
+void OobeDisplayChooser::MoveToTouchDisplay() {
+  auto& displays = display_manager_->active_only_display_list();

[jdufault, 2017/05/08 17:44:57]

nit: auto type is not obvious

+
+  if (displays.size() <= 1) {

[jdufault, 2017/05/08 17:44:57]

nit: drop {}

+    return;
+  }
+
+  for (auto& display : displays) {
+    if (TouchSupportAvailable(display)) {
+      configuration_controller_->SetPrimaryDisplayId(display.id());
+      return;

[jdufault, 2017/05/08 17:44:57]

break?

+    }
+  }
+}
+
+}  // namespace chromeos