Chromium Code Reviews| Index: chrome/browser/chromeos/login/wizard_controller.cc |
| diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc |
| index 7953d4aa4ccd011ec5a8b76efb6e4ea3d780b5e1..93577c2f17644fa38cc01c8295d63e3b9d9953e0 100644 |
| --- a/chrome/browser/chromeos/login/wizard_controller.cc |
| +++ b/chrome/browser/chromeos/login/wizard_controller.cc |
| @@ -52,6 +52,7 @@ |
| #include "chrome/browser/chromeos/net/delay_network_call.h" |
| #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
| #include "chrome/browser/chromeos/policy/device_cloud_policy_initializer.h" |
| +#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
| #include "chrome/browser/chromeos/settings/cros_settings.h" |
| #include "chrome/browser/chromeos/timezone/timezone_provider.h" |
| #include "chrome/browser/lifetime/application_lifetime.h" |
| @@ -106,8 +107,11 @@ bool CanShowHIDDetectionScreen() { |
| } |
| bool ShouldShowControllerPairingScreen() { |
|
achuithb
2014/08/29 23:03:34
Why not get rid of this altogether?
Zachary Kuznia
2014/08/29 23:27:10
Done.
|
| - return CommandLine::ForCurrentProcess()->HasSwitch( |
| - chromeos::switches::kShowControllerPairingDemo); |
| + const bool is_shark = |
| + g_browser_process->platform_part()->browser_policy_connector_chromeos()-> |
|
achuithb
2014/08/29 23:03:34
Might as well just return this instead of creating
Zachary Kuznia
2014/08/29 23:27:10
Function removed.
|
| + GetDeviceCloudPolicyManager()->IsSharkRequisition(); |
| + |
| + return is_shark; |
| } |
| bool ShouldShowHostPairingScreen() { |