Separate StatusAreaView from StatusAreaViewChromeos

chrome/browser/chromeos/login/webui_login_view.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/chromeos/login/webui_login_view.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/accessibility_util.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
-#include "chrome/browser/chromeos/status/clock_menu_button.h"
-#include "chrome/browser/chromeos/status/input_method_menu_button.h"
-#include "chrome/browser/chromeos/status/network_menu_button.h"
-#include "chrome/browser/chromeos/status/status_area_view.h"
+#include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/views/dom_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/render_messages.h"
 #include "content/browser/renderer_host/render_view_host_observer.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "views/desktop/desktop_window_view.h"
 #include "views/widget/widget.h"
@@ skipping 194 matching lines @@
 void WebUILoginView::Layout() {
   DCHECK(webui_login_);
   webui_login_->SetBoundsRect(bounds());
 }
 
 void WebUILoginView::ChildPreferredSizeChanged(View* child) {
   Layout();
   SchedulePaint();
 }
 
-Profile* WebUILoginView::GetProfile() const {
-  return NULL;
+// Overridden from StatusAreaButton::Delegate:
+
+bool WebUILoginView::ShouldExecuteStatusAreaCommand(
+    const views::View* button_view, int command_id) const {
+  if (command_id == StatusAreaViewChromeos::SHOW_NETWORK_OPTIONS)
+    return true;
+  return false;
 }
 
-void WebUILoginView::ExecuteBrowserCommand(int id) const {
-}
-
-bool WebUILoginView::ShouldOpenButtonOptions(
-    const views::View* button_view) const {
-  if (button_view == status_area_->network_view())
-    return true;
-
-  if (button_view == status_area_->clock_view() ||
-      button_view == status_area_->input_method_view())
-    return false;
-
-  return true;
-}
-
-void WebUILoginView::OpenButtonOptions(const views::View* button_view) {
-  if (button_view == status_area_->network_view()) {
+void WebUILoginView::ExecuteStatusAreaCommand(
+    const views::View* button_view, int command_id) {
+  if (command_id == StatusAreaViewChromeos::SHOW_NETWORK_OPTIONS) {
     if (proxy_settings_dialog_.get() == NULL) {
       proxy_settings_dialog_.reset(new ProxySettingsDialog(
           this, GetNativeWindow()));
     }
     proxy_settings_dialog_->Show();
   }
 }
 
-StatusAreaHost::ScreenMode WebUILoginView::GetScreenMode() const {
-  return kWebUILoginMode;
+gfx::Font WebUILoginView::GetStatusAreaFont(const gfx::Font& font) const {
+  return font;
 }
 
-StatusAreaHost::TextStyle WebUILoginView::GetTextStyle() const {
-  return kGrayPlain;
+StatusAreaButton::TextStyle WebUILoginView::GetStatusAreaTextStyle() const {
+  return StatusAreaButton::GRAY_PLAIN;
 }
 
 void WebUILoginView::ButtonVisibilityChanged(views::View* button_view) {
-  status_area_->ButtonVisibilityChanged(button_view);
+  status_area_->UpdateButtonVisibility();
 }
 
+// Overridden from LoginHtmlDialog::Delegate:
+
 void WebUILoginView::OnDialogClosed() {
 }
 
 void WebUILoginView::OnLocaleChanged() {
   // Proxy settings dialog contains localized strings.
   proxy_settings_dialog_.reset();
   SchedulePaint();
 }
 
 void WebUILoginView::OnRenderHostCreated(RenderViewHost* host) {
@@ skipping 40 matching lines @@
 
   OobeUI* oobe_ui = static_cast<OobeUI*>(GetWebUI());
   // Notify OOBE that the login frame has been rendered. Currently
   // this is used to start camera presence check.
   oobe_ui->OnLoginPromptVisible();
 }
 
 void WebUILoginView::InitStatusArea() {
   DCHECK(status_area_ == NULL);
   DCHECK(status_window_ == NULL);
-  status_area_ = new StatusAreaView(this);
-  status_area_->Init();
+  status_area_ = new StatusAreaViewChromeos();
+  status_area_->Init(this, StatusAreaViewChromeos::LOGIN_MODE_WEBUI);
   status_area_->SetVisible(status_area_visibility_on_init_);
 
   // Width of |status_window| is meant to be large enough.
   // The current value of status_area_->GetPreferredSize().width()
   // will be too small when button status is changed.
   // (e.g. when CapsLock indicator appears)
   gfx::Size widget_size(width()/2,
                         status_area_->GetPreferredSize().height());
   const int widget_x = base::i18n::IsRTL() ?
       kStatusAreaCornerPadding :
@@ skipping 67 matching lines @@
                                                         GetFocusManager());
 
   // Make sure error bubble is cleared on keyboard event. This is needed
   // when the focus is inside an iframe.
   WebUI* web_ui = GetWebUI();
   if (web_ui)
     web_ui->CallJavascriptFunction("cr.ui.Oobe.clearErrors");
 }
 
 }  // namespace chromeos