Index: ash/focus_cycler_unittest.cc |
diff --git a/ash/focus_cycler_unittest.cc b/ash/focus_cycler_unittest.cc |
index 39c53a18c02004fc1d95304dd36909cc9769d99a..73804631b8e54a58724568616cec9ea6b30fd5fa 100644 |
--- a/ash/focus_cycler_unittest.cc |
+++ b/ash/focus_cycler_unittest.cc |
@@ -7,6 +7,7 @@ |
#include "ash/launcher/launcher.h" |
#include "ash/shell.h" |
#include "ash/shell_window_ids.h" |
+#include "ash/status_area/status_area_view.h" |
#include "ash/wm/window_util.h" |
#include "ash/test/ash_test_base.h" |
#include "ash/shell_factory.h" |
@@ -47,6 +48,8 @@ TEST_F(FocusCyclerTest, CycleFocusForward) { |
views::Widget* status_widget = internal::CreateStatusArea(NULL); |
ASSERT_TRUE(status_widget); |
focus_cycler->AddWidget(status_widget); |
+ static_cast<internal::StatusAreaView*>(status_widget->GetContentsView())-> |
+ SetFocusCyclerForTesting(focus_cycler.get()); |
// Add a mock button to the status area. |
status_widget->GetContentsView()->AddChildView( |
@@ -88,6 +91,8 @@ TEST_F(FocusCyclerTest, CycleFocusBackward) { |
views::Widget* status_widget = internal::CreateStatusArea(NULL); |
ASSERT_TRUE(status_widget); |
focus_cycler->AddWidget(status_widget); |
+ static_cast<internal::StatusAreaView*>(status_widget->GetContentsView())-> |
+ SetFocusCyclerForTesting(focus_cycler.get()); |
// Add a mock button to the status area. |
status_widget->GetContentsView()->AddChildView( |
@@ -160,6 +165,8 @@ TEST_F(FocusCyclerLauncherTest, CycleFocusForwardInvisible) { |
views::Widget* status_widget = internal::CreateStatusArea(NULL); |
ASSERT_TRUE(status_widget); |
focus_cycler->AddWidget(status_widget); |
+ static_cast<internal::StatusAreaView*>(status_widget->GetContentsView())-> |
+ SetFocusCyclerForTesting(focus_cycler.get()); |
// Add a mock button to the status area. |
status_widget->GetContentsView()->AddChildView( |
@@ -197,6 +204,8 @@ TEST_F(FocusCyclerLauncherTest, CycleFocusBackwardInvisible) { |
views::Widget* status_widget = internal::CreateStatusArea(NULL); |
ASSERT_TRUE(status_widget); |
focus_cycler->AddWidget(status_widget); |
+ static_cast<internal::StatusAreaView*>(status_widget->GetContentsView())-> |
+ SetFocusCyclerForTesting(focus_cycler.get()); |
// Add a mock button to the status area. |
status_widget->GetContentsView()->AddChildView( |