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

Side by Side Diff: chrome/browser/chromeos/login/enrollment/enrollment_screen.cc

Issue 2842163002: Restart browser after Chromad enrollment (Closed)
Patch Set: Restart browser after Chromad enrollment Created 3 years, 8 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chromeos/login/enrollment/enrollment_screen.h" 5 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/metrics/histogram_macros.h" 11 #include "base/metrics/histogram_macros.h"
12 #include "base/timer/elapsed_timer.h" 12 #include "base/timer/elapsed_timer.h"
13 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/browser_process_platform_part.h" 14 #include "chrome/browser/browser_process_platform_part.h"
15 #include "chrome/browser/chromeos/login/enrollment/enrollment_uma.h" 15 #include "chrome/browser/chromeos/login/enrollment/enrollment_uma.h"
16 #include "chrome/browser/chromeos/login/screen_manager.h" 16 #include "chrome/browser/chromeos/login/screen_manager.h"
17 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h" 17 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
18 #include "chrome/browser/chromeos/login/startup_utils.h" 18 #include "chrome/browser/chromeos/login/startup_utils.h"
19 #include "chrome/browser/chromeos/login/wizard_controller.h" 19 #include "chrome/browser/chromeos/login/wizard_controller.h"
20 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 20 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
21 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h" 21 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"
22 #include "chrome/browser/chromeos/profiles/profile_helper.h" 22 #include "chrome/browser/chromeos/profiles/profile_helper.h"
23 #include "chrome/browser/lifetime/application_lifetime.h"
23 #include "chromeos/dbus/cryptohome_client.h" 24 #include "chromeos/dbus/cryptohome_client.h"
24 #include "chromeos/dbus/dbus_method_call_status.h" 25 #include "chromeos/dbus/dbus_method_call_status.h"
25 #include "chromeos/dbus/dbus_thread_manager.h" 26 #include "chromeos/dbus/dbus_thread_manager.h"
26 #include "components/pairing/controller_pairing_controller.h" 27 #include "components/pairing/controller_pairing_controller.h"
27 #include "components/policy/core/common/cloud/cloud_policy_constants.h" 28 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
28 #include "google_apis/gaia/gaia_auth_util.h" 29 #include "google_apis/gaia/gaia_auth_util.h"
29 30
30 using namespace pairing_chromeos; 31 using namespace pairing_chromeos;
31 using policy::EnrollmentConfig; 32 using policy::EnrollmentConfig;
32 33
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 const ScreenExitCode exit_code = 242 const ScreenExitCode exit_code =
242 config_.is_forced() ? ScreenExitCode::ENTERPRISE_ENROLLMENT_BACK 243 config_.is_forced() ? ScreenExitCode::ENTERPRISE_ENROLLMENT_BACK
243 : ScreenExitCode::ENTERPRISE_ENROLLMENT_COMPLETED; 244 : ScreenExitCode::ENTERPRISE_ENROLLMENT_COMPLETED;
244 ClearAuth( 245 ClearAuth(
245 base::Bind(&EnrollmentScreen::Finish, base::Unretained(this), exit_code)); 246 base::Bind(&EnrollmentScreen::Finish, base::Unretained(this), exit_code));
246 } 247 }
247 248
248 void EnrollmentScreen::OnConfirmationClosed() { 249 void EnrollmentScreen::OnConfirmationClosed() {
249 ClearAuth(base::Bind(&EnrollmentScreen::Finish, base::Unretained(this), 250 ClearAuth(base::Bind(&EnrollmentScreen::Finish, base::Unretained(this),
250 ScreenExitCode::ENTERPRISE_ENROLLMENT_COMPLETED)); 251 ScreenExitCode::ENTERPRISE_ENROLLMENT_COMPLETED));
252 // Restart browser to switch from DeviceCloudPolicyManagerChromeOS to
253 // DeviceActiveDirectoryPolicyManager.
254 if (g_browser_process->platform_part()
255 ->browser_policy_connector_chromeos()
256 ->IsActiveDirectoryManaged()) {
257 // TODO(tnagel): Refactor BrowserPolicyConnectorChromeOS so that device
258 // policy providers are only registered after enrollment has finished and
259 // thus the correct one can be picked without restarting the browser.
260 chrome::AttemptRestart();
261 }
251 } 262 }
252 263
253 void EnrollmentScreen::OnAdJoined(const std::string& realm) { 264 void EnrollmentScreen::OnAdJoined(const std::string& realm) {
254 std::move(on_joined_callback_).Run(realm); 265 std::move(on_joined_callback_).Run(realm);
255 } 266 }
256 267
257 void EnrollmentScreen::OnAuthError(const GoogleServiceAuthError& error) { 268 void EnrollmentScreen::OnAuthError(const GoogleServiceAuthError& error) {
258 RecordEnrollmentErrorMetrics(); 269 RecordEnrollmentErrorMetrics();
259 view_->ShowAuthError(error); 270 view_->ShowAuthError(error);
260 } 271 }
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 if (elapsed_timer_) 391 if (elapsed_timer_)
381 UMA_ENROLLMENT_TIME(kMetricEnrollmentTimeFailure, elapsed_timer_); 392 UMA_ENROLLMENT_TIME(kMetricEnrollmentTimeFailure, elapsed_timer_);
382 } 393 }
383 394
384 void EnrollmentScreen::JoinDomain(OnDomainJoinedCallback on_joined_callback) { 395 void EnrollmentScreen::JoinDomain(OnDomainJoinedCallback on_joined_callback) {
385 on_joined_callback_ = std::move(on_joined_callback); 396 on_joined_callback_ = std::move(on_joined_callback);
386 view_->ShowAdJoin(); 397 view_->ShowAdJoin();
387 } 398 }
388 399
389 } // namespace chromeos 400 } // namespace chromeos
OLDNEW
« 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