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

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

Issue 2577093002: Enable Active Directory shortcut on the welcome screen (Closed)
Patch Set: Created 4 years 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 unified diff | Download patch
« no previous file with comments | « no previous file | ui/login/display_manager.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <vector> 10 #include <vector>
(...skipping 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after
1199 // crbug.com/668491). 1199 // crbug.com/668491).
1200 if (chrome::GetChannel() == version_info::Channel::BETA || 1200 if (chrome::GetChannel() == version_info::Channel::BETA ||
1201 chrome::GetChannel() == version_info::Channel::STABLE) { 1201 chrome::GetChannel() == version_info::Channel::STABLE) {
1202 return; 1202 return;
1203 } 1203 }
1204 base::CommandLine::ForCurrentProcess()->AppendSwitch( 1204 base::CommandLine::ForCurrentProcess()->AppendSwitch(
1205 chromeos::switches::kEnableAd); 1205 chromeos::switches::kEnableAd);
1206 chromeos::DBusThreadManager::Get() 1206 chromeos::DBusThreadManager::Get()
1207 ->GetUpstartClient() 1207 ->GetUpstartClient()
1208 ->StartAuthPolicyService(); 1208 ->StartAuthPolicyService();
1209 HandleToggleEnrollmentScreen();
1210 } 1209 }
1211 1210
1212 void SigninScreenHandler::HandleToggleEnableDebuggingScreen() { 1211 void SigninScreenHandler::HandleToggleEnableDebuggingScreen() {
1213 if (delegate_) 1212 if (delegate_)
1214 delegate_->ShowEnableDebuggingScreen(); 1213 delegate_->ShowEnableDebuggingScreen();
1215 } 1214 }
1216 1215
1217 void SigninScreenHandler::HandleToggleKioskEnableScreen() { 1216 void SigninScreenHandler::HandleToggleKioskEnableScreen() {
1218 policy::BrowserPolicyConnectorChromeOS* connector = 1217 policy::BrowserPolicyConnectorChromeOS* connector =
1219 g_browser_process->platform_part()->browser_policy_connector_chromeos(); 1218 g_browser_process->platform_part()->browser_policy_connector_chromeos();
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
1533 } 1532 }
1534 1533
1535 void SigninScreenHandler::OnFeedbackFinished() { 1534 void SigninScreenHandler::OnFeedbackFinished() {
1536 CallJS("login.UnrecoverableCryptohomeErrorScreen.resumeAfterFeedbackUI"); 1535 CallJS("login.UnrecoverableCryptohomeErrorScreen.resumeAfterFeedbackUI");
1537 1536
1538 // Recreate user's cryptohome after the feedback is attempted. 1537 // Recreate user's cryptohome after the feedback is attempted.
1539 HandleResyncUserData(); 1538 HandleResyncUserData();
1540 } 1539 }
1541 1540
1542 } // namespace chromeos 1541 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | ui/login/display_manager.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698