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

ash/status_area/status_area_view.cc

Index: ash/status_area/status_area_view.cc
diff --git a/ash/status_area/status_area_view.cc b/ash/status_area/status_area_view.cc
index fc4a8e0856484f0505178f4d58e3e16b04eb4c18..5c4c68d12cde7153a7232bb1400d6e7c42979afc 100644
--- a/ash/status_area/status_area_view.cc
+++ b/ash/status_area/status_area_view.cc
@@ -5,6 +5,7 @@
 #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"
@@ -20,7 +21,8 @@ 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() {
 }
@@ -37,6 +39,18 @@ 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::SetFocusCyclerForTesting(const FocusCycler* focus_cycler) {
+  focus_cycler_for_testing_ = focus_cycler;
+}
+
 void StatusAreaView::OnPaint(gfx::Canvas* canvas) {
   canvas->DrawBitmapInt(status_mock_, 0, 0);
 }