Fix uber tray to accept focus via tab selection

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 "ash/system/tray/system_tray.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"
 
@@ skipping 31 matching lines @@
 
 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();
+
+  ash::SystemTray* tray = ash::Shell::GetInstance()->tray();
+  bool manually_activating = tray && tray->is_taking_focus();
+
+  return manually_activating ||
+         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);
   }
@@ skipping 11 matching lines @@
   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