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

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

 // Copyright (c) 2011 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/base_screen.h"
 
 #include "base/logging.h"
 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/screens/model_view_channel.h"
 
@@ skipping 49 matching lines @@
   return *this;
 }
 
 const BaseScreen::ContextEditor& BaseScreen::ContextEditor::SetString16List(
     const KeyType& key,
     const String16List& value) const {
   context_.SetString16List(key, value);
   return *this;
 }
 
-BaseScreen::BaseScreen(BaseScreenDelegate* base_screen_delegate)
-    : channel_(nullptr), base_screen_delegate_(base_screen_delegate) {
-}
+BaseScreen::BaseScreen(BaseScreenDelegate* base_screen_delegate,
+                       const std::string& screen_id)
+    : base_screen_delegate_(base_screen_delegate), screen_id_(screen_id) {}
 
 BaseScreen::~BaseScreen() {
 }
 
 void BaseScreen::Initialize(::login::ScreenContext* context) {
   if (context)
     context_.CopyFrom(*context);
 }
 
 void BaseScreen::OnShow() {
 }
 
 void BaseScreen::OnHide() {
 }
 
 void BaseScreen::OnClose() {
 }
 
 bool BaseScreen::IsStatusAreaDisplayed() {
   return true;
 }
 
-std::string BaseScreen::GetID() const {
-  // TODO (ygorshenin, crbug.com/433797): elimitate intermediate
-  // GetName() ASAP.
-  return GetName();
-}
-
 void BaseScreen::CommitContextChanges() {
   if (!context_.HasChanges())
     return;
   if (!channel_) {
-    LOG(ERROR) << "Model-view channel for " << GetID()
+    LOG(ERROR) << "Model-view channel for " << screen_id()
                << " is not ready, context changes are not sent to the view.";
     return;
   }
   base::DictionaryValue diff;
   context_.GetChangesAndReset(&diff);
   channel_->CommitContextChanges(diff);
 }
 
 void BaseScreen::Finish(BaseScreenDelegate::ExitCodes exit_code) {
   base_screen_delegate_->OnExit(*this, exit_code, &context_);
@@ skipping 18 matching lines @@
 }
 
 void BaseScreen::OnContextChanged(const base::DictionaryValue& diff) {
   std::vector<::login::ScreenContext::KeyType> keys;
   context_.ApplyChanges(diff, &keys);
   for (const auto& key : keys)
     OnContextKeyUpdated(key);
 }
 
 }  // namespace chromeos