Merge 95406 - Added version info to WebUI

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

Index: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
===================================================================
--- chrome/browser/ui/webui/chromeos/login/oobe_ui.cc	(revision 95585)
+++ chrome/browser/ui/webui/chromeos/login/oobe_ui.cc	(working copy)
@@ -10,12 +10,12 @@
 #include "base/memory/ref_counted_memory.h"
 #include "base/values.h"
 #include "chrome/browser/browser_about_handler.h"
-#include "chrome/browser/chromeos/accessibility_util.h"
 #include "chrome/browser/chromeos/login/enterprise_enrollment_screen_actor.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/core_oobe_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/enterprise_enrollment_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"
@@ -28,17 +28,10 @@
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/browser_resources.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
-#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
-// JS API callbacks names.
-const char kJsApiScreenStateInitialize[] = "screenStateInitialize";
-const char kJsApiToggleAccessibility[] = "toggleAccessibility";
-
 // Path for the enterprise enrollment gaia page hosting.
 const char kEnterpriseEnrollmentGaiaLoginPath[] = "gaialogin";
 
@@ -66,45 +59,6 @@
   DISALLOW_COPY_AND_ASSIGN(OobeUIHTMLSource);
 };
 
-// CoreOobeHandler -------------------------------------------------------------
-
-// The core handler for Javascript messages related to the "oobe" view.
-class CoreOobeHandler : public BaseScreenHandler {
- public:
-  explicit CoreOobeHandler(OobeUI* oobe_ui);
-  virtual ~CoreOobeHandler();
-
-  // BaseScreenHandler implementation:
-  virtual void GetLocalizedStrings(base::DictionaryValue* localized_strings);
-  virtual void Initialize();
-
-  // WebUIMessageHandler implementation.
-  virtual void RegisterMessages();
-
-  // Show or hide OOBE UI.
-  void ShowOobeUI(bool show);
-
-  bool show_oobe_ui() const {
-    return show_oobe_ui_;
-  }
-
- private:
-  // Handlers for JS WebUI messages.
-  void OnInitialized(const ListValue* args);
-  void OnToggleAccessibility(const ListValue* args);
-
-  // Calls javascript to sync OOBE UI visibility with show_oobe_ui_.
-  void UpdateOobeUIVisibility();
-
-  // Owner of this handler.
-  OobeUI* oobe_ui_;
-
-  // True if we should show OOBE instead of login.
-  bool show_oobe_ui_;
-
-  DISALLOW_COPY_AND_ASSIGN(CoreOobeHandler);
-};
-
 // OobeUIHTMLSource -------------------------------------------------------
 
 OobeUIHTMLSource::OobeUIHTMLSource(DictionaryValue* localized_strings)
@@ -132,58 +86,6 @@
   SendResponse(request_id, base::RefCountedString::TakeString(&response));
 }
 
-// CoreOobeHandler ------------------------------------------------------------
-
-// Note that show_oobe_ui_ defaults to false because WizardController assumes
-// OOBE UI is not visible by default.
-CoreOobeHandler::CoreOobeHandler(OobeUI* oobe_ui)
-    : oobe_ui_(oobe_ui),
-      show_oobe_ui_(false) {
-}
-
-CoreOobeHandler::~CoreOobeHandler() {
-}
-
-void CoreOobeHandler::GetLocalizedStrings(
-    base::DictionaryValue* localized_strings) {
-  localized_strings->SetString(
-      "productName", l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
-}
-
-void CoreOobeHandler::Initialize() {
-  UpdateOobeUIVisibility();
-}
-
-void CoreOobeHandler::RegisterMessages() {
-  web_ui_->RegisterMessageCallback(kJsApiToggleAccessibility,
-      NewCallback(this, &CoreOobeHandler::OnToggleAccessibility));
-  web_ui_->RegisterMessageCallback(kJsApiScreenStateInitialize,
-      NewCallback(this, &CoreOobeHandler::OnInitialized));
-}
-
-void CoreOobeHandler::OnInitialized(const ListValue* args) {
-  oobe_ui_->InitializeHandlers();
-}
-
-void CoreOobeHandler::OnToggleAccessibility(const ListValue* args) {
-  accessibility::ToggleAccessibility();
-}
-
-void CoreOobeHandler::ShowOobeUI(bool show) {
-  if (show == show_oobe_ui_)
-    return;
-
-  show_oobe_ui_ = show;
-
-  if (page_is_ready())
-    UpdateOobeUIVisibility();
-}
-
-void CoreOobeHandler::UpdateOobeUIVisibility() {
-  base::FundamentalValue showValue(show_oobe_ui_);
-  web_ui_->CallJavascriptFunction("cr.ui.Oobe.showOobeUI", showValue);
-}
-
 // OobeUI ----------------------------------------------------------------------
 
 OobeUI::OobeUI(TabContents* contents)