Merge 95406 - Added version info to WebUI

chrome/browser/chromeos/login/background_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_BACKGROUND_VIEW_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_BACKGROUND_VIEW_H_
 #pragma once
 
-#include "chrome/browser/chromeos/boot_times_loader.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/login_html_dialog.h"
 #include "chrome/browser/chromeos/status/status_area_host.h"
-#include "chrome/browser/chromeos/version_loader.h"
-#include "chrome/browser/policy/cloud_policy_subsystem.h"
+#include "chrome/browser/chromeos/login/version_info_updater.h"
 #include "views/view.h"
 
 namespace views {
 class Label;
 class TextButton;
 class Widget;
 class WidgetDelegate;
 }
 
 class DOMView;
 class GURL;
 class Profile;
 
 namespace chromeos {
 
 class OobeProgressBar;
 class ShutdownButton;
 class StatusAreaView;
 
 // View used to render the background during login. BackgroundView contains
 // StatusAreaView.
 class BackgroundView : public views::View,
                        public StatusAreaHost,
-                       public chromeos::LoginHtmlDialog::Delegate,
-                       public policy::CloudPolicySubsystem::Observer {
+                       public LoginHtmlDialog::Delegate,
+                       public VersionInfoUpdater::Delegate {
  public:
   enum LoginStep {
     SELECT_NETWORK,
     EULA,
     SIGNIN,
     REGISTRATION,
     PICTURE,
 
     // Steps count, must be the last in the enum.
     STEPS_COUNT
   };
 
   BackgroundView();
   virtual ~BackgroundView();
 
-  // Initializes the background view. It backgroun_url is given (non empty),
+  // Initializes the background view. It background_url is given (non empty),
   // it creates a DOMView background area that renders a webpage.
   void Init(const GURL& background_url);
 
   // Enable/disable shutdown button.
   void EnableShutdownButton(bool enable);
 
   // Creates a window containing an instance of WizardContentsView as the root
   // view. The caller is responsible for showing (and closing) the returned
   // widget. The BackgroundView is set in |view|. If background_url is non
   // empty, the content page of the url is displayed as a background.
@@ skipping 49 matching lines @@
   virtual bool ShouldOpenButtonOptions(
       const views::View* button_view) const OVERRIDE;
   virtual void OpenButtonOptions(const views::View* button_view) OVERRIDE;
   virtual ScreenMode GetScreenMode() const OVERRIDE;
   virtual TextStyle GetTextStyle() const OVERRIDE;
   virtual void ButtonVisibilityChanged(views::View* button_view) OVERRIDE;
 
   // Overridden from LoginHtmlDialog::Delegate:
   virtual void OnDialogClosed() OVERRIDE {}
 
+  // Overridden from VersionInfoUpdater::Delegate:
+  virtual void OnOSVersionLabelTextUpdated(
+      const std::string& os_version_label_text) OVERRIDE;
+  virtual void OnBootTimesLabelTextUpdated(
+      const std::string& boot_times_label_text) OVERRIDE;
+
  private:
   // Creates and adds the status_area.
   void InitStatusArea();
   // Creates and adds the labels for version and boot time.
   void InitInfoLabels();
   // Creates and add OOBE progress bar.
   void InitProgressBar();
 
   // Invokes SetWindowType for the window. This is invoked during startup and
   // after we've painted.
   void UpdateWindowType();
 
-  // Update the version label.
-  void UpdateVersionLabel();
-
-  // Check and update enterprise domain.
-  void UpdateEnterpriseInfo();
-
-  // Set enterprise domain name.
-  void SetEnterpriseInfo(const std::string& domain_name,
-                         const std::string& status_text);
-
-  // Callback from chromeos::VersionLoader giving the version.
-  void OnVersion(VersionLoader::Handle handle, std::string version);
-  // Callback from chromeos::InfoLoader giving the boot times.
-  void OnBootTimes(
-      BootTimesLoader::Handle handle, BootTimesLoader::BootTimes boot_times);
-
-  // policy::CloudPolicySubsystem::Observer methods:
-  virtual void OnPolicyStateChanged(
-      policy::CloudPolicySubsystem::PolicySubsystemState state,
-      policy::CloudPolicySubsystem::ErrorDetails error_details);
-
   // All of these variables could be NULL.
   StatusAreaView* status_area_;
   views::Label* os_version_label_;
   views::Label* boot_times_label_;
   OobeProgressBar* progress_bar_;
   ShutdownButton* shutdown_button_;
 
-  // Handles asynchronously loading the version.
-  VersionLoader version_loader_;
-  // Used to request the version.
-  CancelableRequestConsumer version_consumer_;
-
-  // Handles asynchronously loading the boot times.
-  BootTimesLoader boot_times_loader_;
-  // Used to request the boot times.
-  CancelableRequestConsumer boot_times_consumer_;
-
   // True if running official BUILD.
   bool is_official_build_;
 
   // DOMView for rendering a webpage as a background.
   DOMView* background_area_;
 
-  // Information pieces for version label.
-  std::string version_text_;
-  std::string enterprise_domain_text_;
-  std::string enterprise_status_text_;
-
   // Proxy settings dialog that can be invoked from network menu.
   scoped_ptr<LoginHtmlDialog> proxy_settings_dialog_;
 
-  // CloudPolicySubsysterm observer registrar
-  scoped_ptr<policy::CloudPolicySubsystem::ObserverRegistrar>
-      cloud_policy_registrar_;
+  // Updates version info.
+  VersionInfoUpdater version_info_updater_;
 
   DISALLOW_COPY_AND_ASSIGN(BackgroundView);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_BACKGROUND_VIEW_H_