Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2432)

Unified Diff: ash/status_area/status_area_view.cc

Issue 10116018: Fix uber tray to accept focus via tab selection (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/system/tray/system_tray.h » ('j') | chrome/browser/chromeos/login/webui_login_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 7e1478f40dd74701b8d56e57c61a652fed87d2e1..ed262197f6b6a566761a8d6fbc60fade4a5c1dee 100644
--- a/ash/status_area/status_area_view.cc
+++ b/ash/status_area/status_area_view.cc
@@ -8,6 +8,7 @@
#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"
@@ -59,7 +60,12 @@ bool StatusAreaView::CanActivate() const {
// 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() {
« no previous file with comments | « no previous file | ash/system/tray/system_tray.h » ('j') | chrome/browser/chromeos/login/webui_login_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698