Chromium Code Reviews| Index: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc |
| diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc |
| index d2db7e5a08c7062d2dcdb78b0667fe2388ae3025..94f71158bb7b01ca53fcbdb18a7681b015be52ff 100644 |
| --- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc |
| +++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc |
| @@ -226,17 +226,12 @@ std::string GetDisplayType(const GURL& url) { |
| return path; |
| } |
| -bool IsKeyboardConnected() { |
| - const std::vector<ui::InputDevice>& keyboards = |
| - ui::InputDeviceManager::GetInstance()->GetKeyboardDevices(); |
| - for (const ui::InputDevice& keyboard : keyboards) { |
| - if (keyboard.type == ui::INPUT_DEVICE_INTERNAL || |
| - keyboard.type == ui::INPUT_DEVICE_EXTERNAL) { |
| - return true; |
| - } |
| - } |
| - |
| - return false; |
| +bool IsRemoraRequisitioned() { |
| + policy::DeviceCloudPolicyManagerChromeOS* policy_manager = |
| + g_browser_process->platform_part() |
| + ->browser_policy_connector_chromeos() |
| + ->GetDeviceCloudPolicyManager(); |
| + return policy_manager && policy_manager->IsRemoraRequisition(); |
| } |
| } // namespace |
| @@ -376,7 +371,7 @@ OobeUI::OobeUI(content::WebUI* web_ui, const GURL& url) |
| // TODO(felixe): Display iteration and primary display selection not supported |
| // in Mash. See http://crbug.com/720917. |
| - if (!ash_util::IsRunningInMash() && !IsKeyboardConnected()) |
| + if (!ash_util::IsRunningInMash() && IsRemoraRequisitioned()) |
|
jdufault
2017/07/06 18:19:35
Why do we want to restrict this?
Felix Ekblom
2017/07/06 19:37:10
I added this as a way to minimize the risk of chan
jdufault
2017/07/06 19:58:49
Not that I'm aware of.
|
| oobe_display_chooser_ = base::MakeUnique<OobeDisplayChooser>(); |
| } |