Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7047)

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 2530833002: Start authpolicyd (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..51f669ae57d062ec277c48803f48d8ffd0c92a8e 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,20 @@ 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* thread_manager =
+ chromeos::DBusThreadManager::Get();
+ DCHECK(thread_manager);
Alexander Alekseev 2016/12/01 09:02:20 ditto
Roman Sorokin (ftl) 2016/12/01 13:18:56 Done.
+ chromeos::UpstartClient* upstart_client = thread_manager->GetUpstartClient();
+ DCHECK(upstart_client);
Alexander Alekseev 2016/12/01 09:02:20 ditto
Roman Sorokin (ftl) 2016/12/01 13:18:56 Done.
+ upstart_client->StartAuthPolicyService();
HandleToggleEnrollmentScreen();
}

Powered by Google App Engine
This is Rietveld 408576698