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

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

Issue 2736873004: Remove custom shortcut for Chromad (Closed)
Patch Set: Created 3 years, 9 months 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
« no previous file with comments | « chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c03f474591846aaa4cbe875f8f50cce753ebed45..700413952f2b9027e76d599379685ebc963f8840 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -587,8 +587,6 @@ void SigninScreenHandler::RegisterMessages() {
AddCallback("removeUser", &SigninScreenHandler::HandleRemoveUser);
AddCallback("toggleEnrollmentScreen",
&SigninScreenHandler::HandleToggleEnrollmentScreen);
- AddCallback("toggleEnrollmentAd",
- &SigninScreenHandler::HandleToggleEnrollmentAd);
AddCallback("toggleEnableDebuggingScreen",
&SigninScreenHandler::HandleToggleEnableDebuggingScreen);
AddCallback("toggleKioskEnableScreen",
@@ -1268,17 +1266,6 @@ void SigninScreenHandler::HandleToggleEnrollmentScreen() {
delegate_->ShowEnterpriseEnrollmentScreen();
}
-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);
-}
-
void SigninScreenHandler::HandleToggleEnableDebuggingScreen() {
if (delegate_)
delegate_->ShowEnableDebuggingScreen();
« no previous file with comments | « chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc ('k') | chromeos/chromeos_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698