| Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| index 9efae546cc454471732adae2f27b24c30607005e..0fabe86f09722c286932fad2f91c8c55d35bdebc 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
|
| @@ -75,6 +75,7 @@
|
| #include "chromeos/chromeos_switches.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| #include "chromeos/dbus/power_manager_client.h"
|
| +#include "chromeos/dbus/upstart_client.h"
|
| #include "chromeos/login/auth/key.h"
|
| #include "chromeos/login/auth/user_context.h"
|
| #include "chromeos/network/network_state.h"
|
| @@ -1198,12 +1199,17 @@ void SigninScreenHandler::HandleToggleEnrollmentScreen() {
|
| }
|
|
|
| void SigninScreenHandler::HandleToggleEnrollmentAd() {
|
| + // TODO(rsorokin): Cleanup enrollment flow for Active Directory. (see
|
| + // crbug.com/668491).
|
| if (chrome::GetChannel() == version_info::Channel::BETA ||
|
| chrome::GetChannel() == version_info::Channel::STABLE) {
|
| return;
|
| }
|
| base::CommandLine::ForCurrentProcess()->AppendSwitch(
|
| chromeos::switches::kEnableAd);
|
| + chromeos::DBusThreadManager::Get()
|
| + ->GetUpstartClient()
|
| + ->StartAuthPolicyService();
|
| HandleToggleEnrollmentScreen();
|
| }
|
|
|
|
|