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

Unified Diff: chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc

Issue 9837112: Revert 129396 - Restart the Chrome session after a successful KIOSK enrollment. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
===================================================================
--- chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc (revision 129413)
+++ chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc (working copy)
@@ -11,8 +11,6 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/cros/cryptohome_library.h"
-#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
-#include "chrome/browser/chromeos/dbus/session_manager_client.h"
#include "chrome/browser/chromeos/login/authenticator.h"
#include "chrome/browser/chromeos/login/screen_observer.h"
#include "chrome/browser/policy/auto_enrollment_client.h"
@@ -80,15 +78,6 @@
}
void EnterpriseEnrollmentScreen::OnConfirmationClosed(bool go_back_to_signin) {
- // If the machine has been put in KIOSK mode we have to restart the session
- // here to go in the proper KIOSK mode login screen.
- if (g_browser_process->browser_policy_connector()->
- GetDeviceCloudPolicyDataStore()->device_mode() ==
- policy::DEVICE_MODE_KIOSK) {
- DBusThreadManager::Get()->GetSessionManagerClient()->StopSession();
- return;
- }
-
get_screen_observer()->OnExit(go_back_to_signin ?
ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED :
ScreenObserver::ENTERPRISE_AUTO_MAGIC_ENROLLMENT_COMPLETED);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698