cros: Break BaseScreenHandler into two classes.

chrome/browser/ui/webui/chromeos/login/base_webui_handler.cc

Index: chrome/browser/ui/webui/chromeos/login/base_webui_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/base_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/base_webui_handler.cc
similarity index 65%
copy from chrome/browser/ui/webui/chromeos/login/base_screen_handler.cc
copy to chrome/browser/ui/webui/chromeos/login/base_webui_handler.cc
index 567594735766132428bdac4d3e134513b11c5939..3bae474ca267dbc62251c524b32294e20a277cd8 100644
--- a/chrome/browser/ui/webui/chromeos/login/base_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/base_webui_handler.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2017 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/ui/webui/chromeos/login/base_screen_handler.h"
+#include "chrome/browser/ui/webui/chromeos/login/base_webui_handler.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ -23,17 +23,17 @@ JSCallsContainer::JSCallsContainer() = default;
 
 JSCallsContainer::~JSCallsContainer() = default;
 
-BaseScreenHandler::BaseScreenHandler() = default;
+BaseWebUIHandler::BaseWebUIHandler() = default;
 
-BaseScreenHandler::BaseScreenHandler(JSCallsContainer* js_calls_container)
+BaseWebUIHandler::BaseWebUIHandler(JSCallsContainer* js_calls_container)
     : js_calls_container_(js_calls_container) {}
 
-BaseScreenHandler::~BaseScreenHandler() {
+BaseWebUIHandler::~BaseWebUIHandler() {
   if (base_screen_)
     base_screen_->set_model_view_channel(nullptr);
 }
 
-void BaseScreenHandler::InitializeBase() {
+void BaseWebUIHandler::InitializeBase() {
   page_is_ready_ = true;
   Initialize();
   if (!pending_context_changes_.empty()) {
@@ -42,41 +42,38 @@ void BaseScreenHandler::InitializeBase() {
   }
 }
 
-void BaseScreenHandler::GetLocalizedStrings(base::DictionaryValue* dict) {
+void BaseWebUIHandler::GetLocalizedStrings(base::DictionaryValue* dict) {
   auto builder = base::MakeUnique<::login::LocalizedValuesBuilder>(dict);
   DeclareLocalizedValues(builder.get());
   GetAdditionalParameters(dict);
 }
 
-void BaseScreenHandler::RegisterMessages() {
-  AddPrefixedCallback("userActed",
-                      &BaseScreenHandler::HandleUserAction);
+void BaseWebUIHandler::RegisterMessages() {
+  AddPrefixedCallback("userActed", &BaseScreenHandler::HandleUserAction);
   AddPrefixedCallback("contextChanged",
                       &BaseScreenHandler::HandleContextChanged);
   DeclareJSCallbacks();
 }
 
-void BaseScreenHandler::CommitContextChanges(
-    const base::DictionaryValue& diff) {
+void BaseWebUIHandler::CommitContextChanges(const base::DictionaryValue& diff) {
   if (!page_is_ready())
     pending_context_changes_.MergeDictionary(&diff);
   else
     CallJS(kMethodContextChanged, diff);
 }
 
-void BaseScreenHandler::GetAdditionalParameters(base::DictionaryValue* dict) {
-}
+void BaseWebUIHandler::GetAdditionalParameters(base::DictionaryValue* dict) {}
 
-void BaseScreenHandler::CallJS(const std::string& method) {
+void BaseWebUIHandler::CallJS(const std::string& method) {
   web_ui()->CallJavascriptFunctionUnsafe(FullMethodPath(method));
 }
 
-void BaseScreenHandler::ShowScreen(OobeScreen screen) {
+void BaseWebUIHandler::ShowScreen(OobeScreen screen) {
   ShowScreenWithData(screen, nullptr);
 }
 
-void BaseScreenHandler::ShowScreenWithData(OobeScreen screen,
-                                           const base::DictionaryValue* data) {
+void BaseWebUIHandler::ShowScreenWithData(OobeScreen screen,
+                                          const base::DictionaryValue* data) {
   if (!web_ui())
     return;
   base::DictionaryValue screen_params;
@@ -87,22 +84,22 @@ void BaseScreenHandler::ShowScreenWithData(OobeScreen screen,
                                          screen_params);
 }
 
-OobeUI* BaseScreenHandler::GetOobeUI() const {
+OobeUI* BaseWebUIHandler::GetOobeUI() const {
   return static_cast<OobeUI*>(web_ui()->GetController());
 }
 
-OobeScreen BaseScreenHandler::GetCurrentScreen() const {
+OobeScreen BaseWebUIHandler::GetCurrentScreen() const {
   OobeUI* oobe_ui = GetOobeUI();
   if (!oobe_ui)
     return OobeScreen::SCREEN_UNKNOWN;
   return oobe_ui->current_screen();
 }
 
-gfx::NativeWindow BaseScreenHandler::GetNativeWindow() {
+gfx::NativeWindow BaseWebUIHandler::GetNativeWindow() {
   return LoginDisplayHost::default_host()->GetNativeWindow();
 }
 
-void BaseScreenHandler::SetBaseScreen(BaseScreen* base_screen) {
+void BaseWebUIHandler::SetBaseScreen(BaseScreen* base_screen) {
   if (base_screen_ == base_screen)
     return;
   if (base_screen_)
@@ -112,23 +109,22 @@ void BaseScreenHandler::SetBaseScreen(BaseScreen* base_screen) {
     base_screen_->set_model_view_channel(this);
 }
 
-std::string BaseScreenHandler::FullMethodPath(const std::string& method) const {
+std::string BaseWebUIHandler::FullMethodPath(const std::string& method) const {
   DCHECK(!method.empty());
   return js_screen_path_prefix_ + method;
 }
 
-void BaseScreenHandler::HandleUserAction(const std::string& action_id) {
+void BaseWebUIHandler::HandleUserAction(const std::string& action_id) {
   if (base_screen_)
     base_screen_->OnUserAction(action_id);
 }
 
-void BaseScreenHandler::HandleContextChanged(
-    const base::DictionaryValue* diff) {
+void BaseWebUIHandler::HandleContextChanged(const base::DictionaryValue* diff) {
   if (diff && base_screen_)
     base_screen_->OnContextChanged(*diff);
 }
 
-void BaseScreenHandler::ExecuteDeferredJSCalls() {
+void BaseWebUIHandler::ExecuteDeferredJSCalls() {
   DCHECK(!js_calls_container_->is_initialized());
   js_calls_container_->mark_initialized();
   for (const auto& deferred_js_call : js_calls_container_->deferred_js_calls())