cros: Refactor of BaseScreen::GetName to BaseScreen::screen_id.

chrome/browser/chromeos/login/wizard_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 
 #include <signal.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <sys/types.h>
@@ skipping 940 matching lines @@
   SetCurrentScreenSmooth(new_current, false);
 }
 
 void WizardController::ShowCurrentScreen() {
   // ShowCurrentScreen may get called by smooth_show_timer_ even after
   // flow has been switched to sign in screen (ExistingUserController).
   if (!oobe_ui_)
     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();
 
   for (auto& observer : observer_list_)
     observer.OnScreenChanged(current_screen_);
 
   current_screen_->Show();
 }
 
 void WizardController::SetCurrentScreenSmooth(BaseScreen* new_current,
                                               bool use_smoothing) {
   if (current_screen_ == new_current || new_current == nullptr ||
       oobe_ui_ == nullptr) {
     return;
   }
 
   smooth_show_timer_.Stop();
 
   if (current_screen_)
     current_screen_->Hide();
 
-  std::string screen_id = new_current->GetName();
+  std::string screen_id = new_current->screen_id();

[achuithb, 2017/01/04 22:29:41]

nit: const

[jdufault, 2017/01/05 20:10:04]

Done.

   if (IsOOBEStepToTrack(screen_id))
     screen_show_times_[screen_id] = base::Time::Now();
 
   previous_screen_ = current_screen_;
   current_screen_ = new_current;
 
   if (use_smoothing) {
     smooth_show_timer_.Start(
         FROM_HERE,
         base::TimeDelta::FromMilliseconds(kShowDelayMs),
@@ skipping 83 matching lines @@
     }
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // WizardController, BaseScreenDelegate overrides:
 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();

[achuithb, 2017/01/04 22:29:41]

nit: const

[jdufault, 2017/01/05 20:10:03]

Done.

   if (IsOOBEStepToTrack(previous_screen_id)) {
     RecordUMAHistogramForOOBEStepCompletionTime(
         previous_screen_id,
         base::Time::Now() - screen_show_times_[previous_screen_id]);
   }
   switch (exit_code) {
     case HID_DETECTION_COMPLETED:
       OnHIDDetectionCompleted();
       break;
     case NETWORK_CONNECTED:
@@ skipping 402 matching lines @@
             : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
   }
 
   EnrollmentScreen* screen = EnrollmentScreen::Get(this);
   screen->SetParameters(effective_config, shark_controller_.get());
   SetStatusAreaVisible(true);
   SetCurrentScreen(screen);
 }
 
 }  // namespace chromeos