Separate StatusAreaView from StatusAreaViewChromeos

chrome/browser/chromeos/login/webui_login_view.h

Index: chrome/browser/chromeos/login/webui_login_view.h
diff --git a/chrome/browser/chromeos/login/webui_login_view.h b/chrome/browser/chromeos/login/webui_login_view.h
index d822f0b72f2db2b9d8899bc3770da13c7d767e19..a5f5ce5588d34a726dae6152358dbde7944bcbcd 100644
--- a/chrome/browser/chromeos/login/webui_login_view.h
+++ b/chrome/browser/chromeos/login/webui_login_view.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "chrome/browser/chromeos/login/login_html_dialog.h"
-#include "chrome/browser/chromeos/status/status_area_host.h"
+#include "chrome/browser/chromeos/status/status_area_button.h"
 #include "chrome/browser/tab_first_render_watcher.h"
 #include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
@@ -25,15 +25,15 @@ class Widget;
 
 namespace chromeos {
 
-class StatusAreaView;
+class StatusAreaViewChromeos;
 
 // View used to render a WebUI supporting Widget. This widget is used for the
 // WebUI based start up and lock screens. It contains a StatusAreaView and
 // DOMView.
 class WebUILoginView : public views::WidgetDelegateView,
-                       public StatusAreaHost,
+                       public StatusAreaButton::Delegate,
                        public TabContentsDelegate,
-                       public chromeos::LoginHtmlDialog::Delegate,
+                       public LoginHtmlDialog::Delegate,
                        public TabFirstRenderWatcher::Delegate {
  public:
   static const int kStatusAreaCornerPadding;
@@ -49,12 +49,12 @@ class WebUILoginView : public views::WidgetDelegateView,
       const views::Accelerator& accelerator) OVERRIDE;
   virtual std::string GetClassName() const OVERRIDE;
 
-  // Overridden from StatusAreaHost:
-  virtual gfx::NativeWindow GetNativeWindow() const;
-
   // Called when WebUI window is created.
   virtual void OnWindowCreated();
 
+  // Gets the native window from the view widget.
+  gfx::NativeWindow GetNativeWindow() const;
+
   // Invokes SetWindowType for the window. This is invoked during startup and
   // after we've painted.
   void UpdateWindowType();
@@ -76,14 +76,13 @@ class WebUILoginView : public views::WidgetDelegateView,
   virtual void Layout() OVERRIDE;
   virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
 
-  // Overridden from StatusAreaHost:
-  virtual Profile* GetProfile() const OVERRIDE;
-  virtual void ExecuteBrowserCommand(int id) const OVERRIDE;
-  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;
+  // Overridden from StatusAreaButton::Delegate:
+  virtual bool ShouldExecuteStatusAreaCommand(
+      const views::View* button_view, int command_id) const OVERRIDE;
+  virtual void ExecuteStatusAreaCommand(
+      const views::View* button_view, int command_id) OVERRIDE;
+  virtual gfx::Font GetStatusAreaFont(const gfx::Font& font) const OVERRIDE;
+  virtual StatusAreaButton::TextStyle GetStatusAreaTextStyle() const OVERRIDE;
   virtual void ButtonVisibilityChanged(views::View* button_view) OVERRIDE;
 
   // Overridden from LoginHtmlDialog::Delegate:
@@ -98,7 +97,7 @@ class WebUILoginView : public views::WidgetDelegateView,
   // Creates and adds the status area (separate window).
   virtual void InitStatusArea();
 
-  StatusAreaView* status_area_;
+  StatusAreaViewChromeos* status_area_;
 
   // DOMView for rendering a webpage as a webui login.
   DOMView* webui_login_;