Separate StatusAreaView from StatusAreaViewChromeos

chrome/browser/chromeos/status/status_area_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/status/status_area_view.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "chrome/browser/chromeos/status/accessibility_menu_button.h"
 #include "chrome/browser/chromeos/status/caps_lock_menu_button.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/memory_menu_button.h"
 #include "chrome/browser/chromeos/status/network_menu_button.h"
 #include "chrome/browser/chromeos/status/power_menu_button.h"
-#include "chrome/browser/chromeos/status/status_area_host.h"
 #include "chrome/common/chrome_switches.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "views/border.h"
 #include "views/controls/image_view.h"
 
-namespace chromeos {
-
 // Number of pixels to separate each icon.
 #if defined(TOUCH_UI)
 const int kSeparation = 25;
 #else
 const int kSeparation = 0;
 #endif
 
-StatusAreaView::StatusAreaView(StatusAreaHost* host)
-    : host_(host),
-      accessibility_view_(NULL),
-      caps_lock_view_(NULL),
-      clock_view_(NULL),
-      input_method_view_(NULL),
-      memory_view_(NULL),
-      network_view_(NULL),
-      power_view_(NULL),
-      need_return_focus_(false) {
+StatusAreaView::StatusAreaView()
+    : need_return_focus_(false) {
 }
 
 StatusAreaView::~StatusAreaView() {
 }
 
-void StatusAreaView::Init() {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kMemoryWidget)) {
-    memory_view_ = new MemoryMenuButton(host_);
-    AddChildView(memory_view_);
+void StatusAreaView::AddButton(StatusAreaButton* button, bool bordered) {
+  buttons_.push_back(button);
+  if (bordered)
+    button->set_border(views::Border::CreateEmptyBorder(0, 1, 0, 0));
+  AddChildView(button);
+  UpdateButtonVisibility();
+}
+
+void StatusAreaView::RemoveButton(StatusAreaButton* button) {
+  std::list<StatusAreaButton*>::iterator iter =
+      std::find(buttons_.begin(), buttons_.end(), button);
+  if (iter != buttons_.end()) {
+    RemoveChildView(*iter);
+    buttons_.erase(iter);
   }
+  UpdateButtonVisibility();
+}
 
-  accessibility_view_ = new AccessibilityMenuButton(host_);
-  accessibility_view_->set_border(views::Border::CreateEmptyBorder(0, 1, 0, 0));
-  AddChildView(accessibility_view_);
-
-  caps_lock_view_ = new CapsLockMenuButton(host_);
-  caps_lock_view_->set_border(views::Border::CreateEmptyBorder(0, 1, 0, 0));
-  AddChildView(caps_lock_view_);
-
-  clock_view_ = new ClockMenuButton(host_);
-  clock_view_->set_border(views::Border::CreateEmptyBorder(0, 1, 0, 0));
-  AddChildView(clock_view_);
-
-  input_method_view_ = new InputMethodMenuButton(host_);
-  AddChildView(input_method_view_);
-
-  network_view_ = new NetworkMenuButton(host_);
-  AddChildView(network_view_);
-
-  power_view_ = new PowerMenuButton(host_);
-  AddChildView(power_view_);
-}
+// views::View* overrides.
 
 gfx::Size StatusAreaView::GetPreferredSize() {
   int result_w = 0;
   int result_h = 0;
 
   for (int i = 0; i < child_count(); i++) {
     views::View* cur = child_at(i);
     gfx::Size cur_size = cur->GetPreferredSize();
     if (cur->IsVisible() && !cur_size.IsEmpty()) {
       if (result_w == 0)
@@ skipping 28 matching lines @@
 
 void StatusAreaView::ChildPreferredSizeChanged(View* child) {
   // When something like the clock menu button's size changes, we need to
   // relayout. Also mark that this view's size has changed. This will let
   // BrowserView know to relayout, which will reset the bounds of this view.
   Layout();
   PreferredSizeChanged();
 }
 
 void StatusAreaView::MakeButtonsActive(bool active) {
-  if (memory_view_)
-    memory_view_->set_active(active);
-  accessibility_view()->set_active(active);
-  caps_lock_view()->set_active(active);
-  clock_view()->set_active(active);
-  input_method_view()->set_active(active);
-  network_view()->set_active(active);
-  power_view()->set_active(active);
+  for (std::list<StatusAreaButton*>::iterator iter = buttons_.begin();
+       iter != buttons_.end(); ++iter) {
+    (*iter)->set_menu_active(active);
+  }
 }
 
-void StatusAreaView::ButtonVisibilityChanged(views::View* button_view) {
+void StatusAreaView::UpdateButtonVisibility() {
   Layout();
   PreferredSizeChanged();
 }
 
 void StatusAreaView::TakeFocus(
     bool reverse,
     const ReturnFocusCallback& return_focus_cb) {
   // Emulates focus receive by AccessiblePaneView::SetPaneFocus.
   if (!focus_manager_)
     focus_manager_ = GetFocusManager();
@@ skipping 26 matching lines @@
     const views::View* first = GetFirstFocusableChild();
     const views::View* last = GetLastFocusableChild();
     const bool first_to_last = (focused_before == first && focused_now == last);
     const bool last_to_first = (focused_now == first && focused_before == last);
 
     if (first_to_last || last_to_first)
       MessageLoop::current()->PostTask(FROM_HERE,
           base::Bind(&StatusAreaView::ReturnFocus, AsWeakPtr(), first_to_last));
   }
 }
-
-}  // namespace chromeos