Separate StatusAreaView from StatusAreaViewChromeos

chrome/browser/chromeos/login/background_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/background_view.h"
 
 #include <string>
 #include <vector>
 
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/oobe_progress_bar.h"
 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/shutdown_button.h"
 #include "chrome/browser/chromeos/login/wizard_controller.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/policy/browser_policy_connector.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/views/dom_view.h"
 #include "chrome/browser/ui/views/window.h"
 #include "chrome/common/chrome_version_info.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
@@ skipping 39 matching lines @@
 
 }  // namespace
 
 namespace chromeos {
 
 ///////////////////////////////////////////////////////////////////////////////
 // BackgroundView public:
 
 BackgroundView::BackgroundView()
     : status_area_(NULL),
+      screen_mode_(StatusAreaViewChromeos::LOGIN_MODE_VIEWS),
       os_version_label_(NULL),
       boot_times_label_(NULL),
       progress_bar_(NULL),
       shutdown_button_(NULL),
 #if defined(OFFICIAL_BUILD)
       is_official_build_(true),
 #else
       is_official_build_(false),
 #endif
       background_area_(NULL),
@@ skipping 115 matching lines @@
 bool BackgroundView::IsScreenSaverVisible() {
   return ScreenSaverEnabled() && background_area_->IsVisible();
 }
 
 bool BackgroundView::ScreenSaverEnabled() {
   return background_area_ != NULL;
 }
 
 void BackgroundView::SetDefaultUse24HourClock(bool use_24hour_clock) {
   DCHECK(status_area_);
-  status_area_->clock_view()->SetDefaultUse24HourClock(use_24hour_clock);
+  ClockMenuButton* clock_view = static_cast<ClockMenuButton*>(

[DaveMoore, 2011/11/07 15:36:18]

I'd rather see GetClockMenuButton() in StatusAreaViewChromeos than casts

[stevenjb, 2011/11/08 00:24:22]

I think all of this is better off in StatusAreaViewChromeos().
Done.

+      status_area_->GetViewByID(VIEW_ID_STATUS_BUTTON_CLOCK));
+  if (clock_view)
+    clock_view->SetDefaultUse24HourClock(use_24hour_clock);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BackgroundView protected:
 
 void BackgroundView::Layout() {
   const int kCornerPadding = 5;
   const int kInfoLeftPadding = 10;
   const int kInfoBottomPadding = 10;
   const int kInfoBetweenLinesPadding = 1;
@@ skipping 34 matching lines @@
   }
   if (background_area_)
     background_area_->SetBoundsRect(this->bounds());
 }
 
 void BackgroundView::ChildPreferredSizeChanged(View* child) {
   Layout();
   SchedulePaint();
 }
 
-Profile* BackgroundView::GetProfile() const {
-  return NULL;
+// Overridden from StatusAreaButton::Delegate:
+
+bool BackgroundView::ShouldExecuteStatusAreaCommand(
+    const views::View* button_view, int command_id) const {
+  if (command_id == StatusAreaViewChromeos::SHOW_NETWORK_OPTIONS)
+    return true;
+  return false;
 }
 
-bool BackgroundView::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 BackgroundView::OpenButtonOptions(const views::View* button_view) {
-  if (button_view == status_area_->network_view()) {
+void BackgroundView::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 BackgroundView::GetScreenMode() const {
-  return kViewsLoginMode;
+int BackgroundView::GetFontStyle(const gfx::Font& font) const {
+  return gfx::Font::BOLD;
 }
 
-StatusAreaHost::TextStyle BackgroundView::GetTextStyle() const {
-  return kGrayPlain;
+StatusAreaButton::TextStyle BackgroundView::GetTextStyle() const {
+  return StatusAreaButton::GRAY_PLAIN;
 }
 
 void BackgroundView::ButtonVisibilityChanged(views::View* button_view) {
-  status_area_->ButtonVisibilityChanged(button_view);
+  status_area_->UpdateButtonVisibility();
 }
 
 // Overridden from LoginHtmlDialog::Delegate:
+
 void BackgroundView::OnLocaleChanged() {
   // Proxy settings dialog contains localized strings.
   proxy_settings_dialog_.reset();
   InitInfoLabels();
   SchedulePaint();
 }
 
 void BackgroundView::OnOSVersionLabelTextUpdated(
     const std::string& os_version_label_text) {
   os_version_label_->SetText(UTF8ToUTF16(os_version_label_text));
 }
 
 void BackgroundView::OnBootTimesLabelTextUpdated(
     const std::string& boot_times_label_text) {
   boot_times_label_->SetText(UTF8ToUTF16(boot_times_label_text));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BackgroundView private:
 
 void BackgroundView::InitStatusArea() {
   DCHECK(status_area_ == NULL);
-  status_area_ = new StatusAreaView(this);
-  status_area_->Init();
+  status_area_ = new StatusAreaViewChromeos();
+  status_area_->Init(this, screen_mode_);
   AddChildView(status_area_);
 }
 
 void BackgroundView::InitInfoLabels() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   {
     int idx = GetIndexOf(os_version_label_);
     delete os_version_label_;
     os_version_label_ = new views::Label();
@@ skipping 43 matching lines @@
 #if defined(TOOLKIT_USES_GTK)
   std::vector<int> params;
   WmIpc::instance()->SetWindowType(
       GTK_WIDGET(GetNativeWindow()),
       WM_IPC_WINDOW_LOGIN_BACKGROUND,
       &params);
 #endif
 }
 
 }  // namespace chromeos