Revert 133691 because it accidentally reverted revs 133686 and 133684.

ash/status_area/status_area_view.cc

Index: ash/status_area/status_area_view.cc
===================================================================
--- ash/status_area/status_area_view.cc	(revision 133697)
+++ ash/status_area/status_area_view.cc	(working copy)
@@ -1,93 +0,0 @@
-// Copyright (c) 2012 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 "ash/status_area/status_area_view.h"
-
-#include "ash/ash_export.h"
-#include "ash/focus_cycler.h"
-#include "ash/shell.h"
-#include "ash/shell_window_ids.h"
-#include "base/utf_string_conversions.h"
-#include "grit/ui_resources.h"
-#include "ui/aura/root_window.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/canvas.h"
-#include "ui/gfx/image/image.h"
-#include "ui/views/accessible_pane_view.h"
-#include "ui/views/layout/fill_layout.h"
-#include "ui/views/widget/widget.h"
-
-namespace ash {
-namespace internal {
-
-StatusAreaView::StatusAreaView()
-    : focus_cycler_for_testing_(NULL) {
-  SetLayoutManager(new views::FillLayout);
-}
-
-StatusAreaView::~StatusAreaView() {
-}
-
-void StatusAreaView::SetFocusCyclerForTesting(const FocusCycler* focus_cycler) {
-  focus_cycler_for_testing_ = focus_cycler;
-}
-
-views::View* StatusAreaView::GetDefaultFocusableChild() {
-  return child_at(0);
-}
-
-bool StatusAreaView::AcceleratorPressed(const ui::Accelerator& accelerator) {
-  if (accelerator.key_code() == ui::VKEY_ESCAPE) {
-    RemovePaneFocus();
-    GetFocusManager()->ClearFocus();
-    return true;
-  }
-  return false;
-}
-
-views::Widget* StatusAreaView::GetWidget() {
-  return View::GetWidget();
-}
-
-const views::Widget* StatusAreaView::GetWidget() const {
-  return View::GetWidget();
-}
-
-bool StatusAreaView::CanActivate() const {
-  // We don't want mouse clicks to activate us, but we need to allow
-  // activation when the user is using the keyboard (FocusCycler).
-  const FocusCycler* focus_cycler = focus_cycler_for_testing_ ?
-      focus_cycler_for_testing_ : Shell::GetInstance()->focus_cycler();
-  return focus_cycler->widget_activating() == GetWidget();
-}
-
-void StatusAreaView::DeleteDelegate() {
-}
-
-ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents) {
-  if (!contents) {
-    contents = new views::View;
-    contents->set_focusable(true);
-  }
-  StatusAreaView* status_area_view = new StatusAreaView;
-  views::Widget* widget = new views::Widget;
-  views::Widget::InitParams params(
-      views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
-  gfx::Size ps = contents->GetPreferredSize();
-  params.bounds = gfx::Rect(0, 0, ps.width(), ps.height());
-  params.delegate = status_area_view;
-  params.parent = Shell::GetInstance()->GetContainer(
-      ash::internal::kShellWindowId_StatusContainer);
-  params.transparent = true;
-  widget->Init(params);
-  widget->set_focus_on_creation(false);
-  status_area_view->AddChildView(contents);
-  widget->SetContentsView(status_area_view);
-  widget->Show();
-  widget->GetNativeView()->SetName("StatusAreaView");
-  return widget;
-}
-
-}  // namespace internal
-}  // namespace ash