[ChromeOS] WebUI OOBE/Login refactoring.

chrome/browser/ui/webui/chromeos/login/oobe_ui.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/ui/webui/chromeos/login/oobe_ui.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/values.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
@@ skipping 23 matching lines @@
     return "text/html";
   }
 
  private:
   virtual ~OobeUIHTMLSource() {}
 
   scoped_ptr<DictionaryValue> localized_strings_;
   DISALLOW_COPY_AND_ASSIGN(OobeUIHTMLSource);
 };
 
-// OobeMessageHandler ----------------------------------------------------------
-OobeMessageHandler::OobeMessageHandler() : page_is_ready_(false) {
-}
-
-OobeMessageHandler::~OobeMessageHandler() {
-}
-
-void OobeMessageHandler::InitializeBase() {
-  page_is_ready_ = true;
-  Initialize();
-}
-
 // CoreOobeHandler -------------------------------------------------------------
 
 // The core handler for Javascript messages related to the "oobe" view.
-class CoreOobeHandler : public OobeMessageHandler {
+class CoreOobeHandler : public BaseScreenHandler {
  public:
   explicit CoreOobeHandler(OobeUI* oobe_ui);
   virtual ~CoreOobeHandler();
 
-  // OobeMessageHandler implementation:
+  // BaseScreenHandler implementation:
   virtual void GetLocalizedStrings(DictionaryValue* localized_strings);
   virtual void Initialize();
 
   // WebUIMessageHandler implementation.
   virtual void RegisterMessages();
 
  private:
   // Handlers for JS WebUI messages.
   void OnInitialized(const ListValue* args);
 
@@ skipping 52 matching lines @@
 }
 
 // OobeUI ----------------------------------------------------------------------
 
 OobeUI::OobeUI(TabContents* contents)
     : ChromeWebUI(contents),
       update_screen_actor_(NULL),
       network_screen_actor_(NULL),
       eula_screen_actor_(NULL),
       signin_screen_handler_(NULL) {
-  AddOobeMessageHandler(new CoreOobeHandler(this));
+  AddScreenHandler(new CoreOobeHandler(this));
 
   NetworkScreenHandler* network_screen_handler = new NetworkScreenHandler;
   network_screen_actor_ = network_screen_handler;
-  AddOobeMessageHandler(network_screen_handler);
+  AddScreenHandler(network_screen_handler);
 
   EulaScreenHandler* eula_screen_handler = new EulaScreenHandler;
   eula_screen_actor_ = eula_screen_handler;
-  AddOobeMessageHandler(eula_screen_handler);
+  AddScreenHandler(eula_screen_handler);
 
   UpdateScreenHandler* update_screen_handler = new UpdateScreenHandler;
   update_screen_actor_ = update_screen_handler;
-  AddOobeMessageHandler(update_screen_handler);
+  AddScreenHandler(update_screen_handler);
 
   signin_screen_handler_ = new SigninScreenHandler;
-  AddOobeMessageHandler(signin_screen_handler_);
+  AddScreenHandler(signin_screen_handler_);
 
   DictionaryValue* localized_strings = new DictionaryValue;
   GetLocalizedStrings(localized_strings);
   OobeUIHTMLSource* html_source =
       new OobeUIHTMLSource(localized_strings);
 
   // Set up the chrome://theme/ source, for Chrome logo.
   ThemeSource* theme = new ThemeSource(contents->profile());
   contents->profile()->GetChromeURLDataManager()->AddDataSource(theme);
 
@@ skipping 40 matching lines @@
 }
 
 ViewScreenDelegate* OobeUI::GetHTMLPageScreenActor() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 void OobeUI::GetLocalizedStrings(DictionaryValue* localized_strings) {
   // Note, handlers_[0] is a GenericHandler used by the WebUI.
   for (size_t i = 1; i < handlers_.size(); ++i) {
-    static_cast<OobeMessageHandler*>(handlers_[i])->
+    static_cast<BaseScreenHandler*>(handlers_[i])->
         GetLocalizedStrings(localized_strings);
   }
   ChromeURLDataManager::DataSource::SetFontAndTextDirection(localized_strings);
 }
 
-void OobeUI::AddOobeMessageHandler(OobeMessageHandler* handler) {
+void OobeUI::AddScreenHandler(BaseScreenHandler* handler) {
   AddMessageHandler(handler->Attach(this));
 }
 
 void OobeUI::InitializeHandlers() {
   // Note, handlers_[0] is a GenericHandler used by the WebUI.
   for (size_t i = 1; i < handlers_.size(); ++i) {
-    static_cast<OobeMessageHandler*>(handlers_[i])->InitializeBase();
+    static_cast<BaseScreenHandler*>(handlers_[i])->InitializeBase();
   }
 }
 
 void OobeUI::ShowSigninScreen() {
   signin_screen_handler_->Show();
 }
 
 }  // namespace chromeos