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

chrome/browser/chromeos/login/screens/controller_pairing_screen.cc

 // Copyright 2014 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/screens/controller_pairing_screen.h"
 
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 
 using namespace chromeos::controller_pairing;
 using namespace pairing_chromeos;
 
 namespace chromeos {
 
 ControllerPairingScreen::ControllerPairingScreen(
     BaseScreenDelegate* base_screen_delegate,
     Delegate* delegate,
     ControllerPairingScreenActor* actor,
     ControllerPairingController* shark_controller)
-    : BaseScreen(base_screen_delegate),
+    : BaseScreen(base_screen_delegate,
+                 WizardController::kControllerPairingScreenName),
       delegate_(delegate),
       actor_(actor),
       shark_controller_(shark_controller),
       current_stage_(ControllerPairingController::STAGE_NONE),
       device_preselected_(false) {
   actor_->SetDelegate(this);
   shark_controller_->AddObserver(this);
 }
 
 ControllerPairingScreen::~ControllerPairingScreen() {
@@ skipping 23 matching lines @@
   if (actor_)
     actor_->Show();
   shark_controller_->StartPairing();
 }
 
 void ControllerPairingScreen::Hide() {
   if (actor_)
     actor_->Hide();
 }
 
-std::string ControllerPairingScreen::GetName() const {
-  return WizardController::kControllerPairingScreenName;
-}
-
 void ControllerPairingScreen::PairingStageChanged(Stage new_stage) {
   DCHECK(new_stage != current_stage_);
 
   std::string desired_page;
   switch (new_stage) {
     case ControllerPairingController::STAGE_DEVICES_DISCOVERY: {
       desired_page = kPageDevicesDiscovery;
       context_.SetStringList(kContextKeyDevices, ::login::StringList());
       context_.SetString(kContextKeySelectedDevice, std::string());
       device_preselected_ = false;
@@ skipping 131 matching lines @@
        ++key) {
     if (*key == kContextKeySelectedDevice) {
       context_.SetBoolean(kContextKeyControlsDisabled,
                           context_.GetString(*key).empty());
       CommitContextChanges();
     }
   }
 }
 
 }  // namespace chromeos