Activate the status area only when it's focused using the keyboard

ash/status_area/status_area_view.cc

 // 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/widget/widget.h"
 
 namespace ash {
 namespace internal {
 
 StatusAreaView::StatusAreaView()
     : status_mock_(*ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-          IDR_AURA_STATUS_MOCK).ToSkBitmap()) {
+          IDR_AURA_STATUS_MOCK).ToSkBitmap()),
+      focus_cycler_for_testing_(NULL) {
 }
 StatusAreaView::~StatusAreaView() {
 }
 
+void StatusAreaView::SetFocusCyclerForTesting(const FocusCycler* focus_cycler) {
+  focus_cycler_for_testing_ = focus_cycler;
+}
+
 gfx::Size StatusAreaView::GetPreferredSize() {
   return gfx::Size(status_mock_.width(), status_mock_.height());
 }
 
 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::OnPaint(gfx::Canvas* canvas) {
   canvas->DrawBitmapInt(status_mock_, 0, 0);
 }
 
 ASH_EXPORT views::Widget* CreateStatusArea(views::View* contents) {
   StatusAreaView* status_area_view = new StatusAreaView;
   if (!contents)
     contents = status_area_view;
   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);
   widget->SetContentsView(contents);
   widget->Show();
   widget->GetNativeView()->SetName("StatusAreaView");
   return widget;
 }
 
 }  // namespace internal
 }  // namespace ash