summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-04 22:23:57 +0000
committerdmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-04 22:23:57 +0000
commite5578b17d88fd9922b1b5b6e4edfce7b1bb57bef (patch)
tree80e79c46fe2ec07bd2c7fd0a583be3384c5526d3
parentf6550416b02e7918b4eca4607804694aecdcc09a (diff)
downloadchromium_src-e5578b17d88fd9922b1b5b6e4edfce7b1bb57bef.zip
chromium_src-e5578b17d88fd9922b1b5b6e4edfce7b1bb57bef.tar.gz
chromium_src-e5578b17d88fd9922b1b5b6e4edfce7b1bb57bef.tar.bz2
Don't try to focus uber tray if it's not showing.
BUG=126291,chromium-os:30554 TEST=manual testing of chrome os oobe Review URL: http://codereview.chromium.org/10365021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135460 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/login/webui_login_view.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc
index 752cfa3..9031a91 100644
--- a/chrome/browser/chromeos/login/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/webui_login_view.cc
@@ -318,7 +318,7 @@ bool WebUILoginView::IsPopupOrPanel(const WebContents* source) const {
bool WebUILoginView::TakeFocus(bool reverse) {
ash::SystemTray* tray = ash::Shell::GetInstance()->tray();
- if (tray) {
+ if (tray && tray->GetWidget()->IsVisible()) {
tray->SetNextFocusableView(this);
ash::Shell::GetInstance()->RotateFocus(reverse ? ash::Shell::BACKWARD :
ash::Shell::FORWARD);