Index: ash/focus_cycler.cc |
diff --git a/ash/focus_cycler.cc b/ash/focus_cycler.cc |
index 25f74f3b32c2b56986f09cba65108d737d7a8b4d..eccb99206752a4b506dd3f193ee0628c337618a6 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; |
} |