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

Unified Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 2549373005: cros: Refactor of BaseScreen::GetName to BaseScreen::screen_id. (Closed)
Patch Set: Remove unneeded mock method 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/wizard_controller.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index ceba540de4a9eb9ee28b7f74b2099b4f8aec07c2..f221b07f017fe2b9031579a2b654e3089ffc1f9b 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -957,8 +957,8 @@ void WizardController::ShowCurrentScreen() {
return;
// First remember how far have we reached so that we can resume if needed.
- if (is_out_of_box_ && IsResumableScreen(current_screen_->GetName()))
- StartupUtils::SaveOobePendingScreen(current_screen_->GetName());
+ if (is_out_of_box_ && IsResumableScreen(current_screen_->screen_id()))
+ StartupUtils::SaveOobePendingScreen(current_screen_->screen_id());
smooth_show_timer_.Stop();
@@ -980,7 +980,7 @@ void WizardController::SetCurrentScreenSmooth(BaseScreen* new_current,
if (current_screen_)
current_screen_->Hide();
- std::string screen_id = new_current->GetName();
+ std::string screen_id = new_current->screen_id();
if (IsOOBEStepToTrack(screen_id))
screen_show_times_[screen_id] = base::Time::Now();
@@ -1084,7 +1084,7 @@ void WizardController::OnExit(BaseScreen& /* screen */,
ExitCodes exit_code,
const ::login::ScreenContext* /* context */) {
VLOG(1) << "Wizard screen exit code: " << exit_code;
- std::string previous_screen_id = current_screen_->GetName();
+ std::string previous_screen_id = current_screen_->screen_id();
if (IsOOBEStepToTrack(previous_screen_id)) {
RecordUMAHistogramForOOBEStepCompletionTime(
previous_screen_id,

Powered by Google App Engine
This is Rietveld 408576698