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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 2341613006: cros: Fix MD OOBE crash (Closed)
Patch Set: Created 4 years, 3 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 | « chrome/browser/chromeos/login/wizard_controller.h ('k') | 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/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdlib.h> 9 #include <stdlib.h>
10 #include <sys/types.h> 10 #include <sys/types.h>
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 return; 424 return;
425 425
426 if (!time_eula_accepted_.is_null()) { 426 if (!time_eula_accepted_.is_null()) {
427 base::TimeDelta delta = base::Time::Now() - time_eula_accepted_; 427 base::TimeDelta delta = base::Time::Now() - time_eula_accepted_;
428 UMA_HISTOGRAM_MEDIUM_TIMES("OOBE.EULAToSignInTime", delta); 428 UMA_HISTOGRAM_MEDIUM_TIMES("OOBE.EULAToSignInTime", delta);
429 } 429 }
430 VLOG(1) << "Showing login screen."; 430 VLOG(1) << "Showing login screen.";
431 SetStatusAreaVisible(true); 431 SetStatusAreaVisible(true);
432 host_->StartSignInScreen(context); 432 host_->StartSignInScreen(context);
433 smooth_show_timer_.Stop(); 433 smooth_show_timer_.Stop();
434 oobe_ui_ = nullptr;
435 login_screen_started_ = true; 434 login_screen_started_ = true;
436 } 435 }
437 436
438 void WizardController::ShowUpdateScreen() { 437 void WizardController::ShowUpdateScreen() {
439 VLOG(1) << "Showing update screen."; 438 VLOG(1) << "Showing update screen.";
440 SetStatusAreaVisible(true); 439 SetStatusAreaVisible(true);
441 SetCurrentScreen(GetScreen(kUpdateScreenName)); 440 SetCurrentScreen(GetScreen(kUpdateScreenName));
442 } 441 }
443 442
444 void WizardController::ShowUserImageScreen() { 443 void WizardController::ShowUserImageScreen() {
(...skipping 976 matching lines...) Expand 10 before | Expand all | Expand 10 after
1421 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; 1420 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
1422 } 1421 }
1423 1422
1424 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1423 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1425 screen->SetParameters(effective_config, shark_controller_.get()); 1424 screen->SetParameters(effective_config, shark_controller_.get());
1426 SetStatusAreaVisible(true); 1425 SetStatusAreaVisible(true);
1427 SetCurrentScreen(screen); 1426 SetCurrentScreen(screen);
1428 } 1427 }
1429 1428
1430 } // namespace chromeos 1429 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698