summaryrefslogtreecommitdiffstats
path: root/ash/focus_cycler.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ash/focus_cycler.cc')
-rw-r--r--ash/focus_cycler.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/ash/focus_cycler.cc b/ash/focus_cycler.cc
index 25f74f3..eccb992 100644
--- a/ash/focus_cycler.cc
+++ b/ash/focus_cycler.cc
@@ -17,7 +17,7 @@ namespace ash {
namespace internal {
-FocusCycler::FocusCycler() {
+FocusCycler::FocusCycler() : widget_activating_(NULL) {
}
FocusCycler::~FocusCycler() {
@@ -71,7 +71,9 @@ void FocusCycler::RotateFocus(Direction direction) {
views::AccessiblePaneView* view =
static_cast<views::AccessiblePaneView*>(widget->GetContentsView());
if (view->SetPaneFocusAndFocusDefault()) {
+ widget_activating_ = widget;
widget->Activate();
+ widget_activating_ = NULL;
if (widget->IsActive())
break;
}