| Index: ash/shelf/shelf_widget_unittest.cc
|
| diff --git a/ash/shelf/shelf_widget_unittest.cc b/ash/shelf/shelf_widget_unittest.cc
|
| index 50fce9de90874aa62adff6f183a6b4161ba3f9c0..ed613bb26840c855723715e9ce270c8194b630b1 100644
|
| --- a/ash/shelf/shelf_widget_unittest.cc
|
| +++ b/ash/shelf/shelf_widget_unittest.cc
|
| @@ -39,22 +39,6 @@ internal::ShelfLayoutManager* GetShelfLayoutManager() {
|
|
|
| typedef test::AshTestBase ShelfWidgetTest;
|
|
|
| -// Shelf can't be activated on mouse click, but it is activable from
|
| -// the focus cycler or as fallback.
|
| -// TODO(mtomasz): make this test work with the FocusController.
|
| -// crbug.com/285364.
|
| -TEST_F(ShelfWidgetTest, DISABLED_ActivateAsFallback) {
|
| - Shelf* shelf = Shelf::ForPrimaryDisplay();
|
| - ShelfWidget* shelf_widget = shelf->shelf_widget();
|
| - EXPECT_FALSE(shelf_widget->CanActivate());
|
| -
|
| - shelf_widget->WillActivateAsFallback();
|
| - EXPECT_TRUE(shelf_widget->CanActivate());
|
| -
|
| - wm::ActivateWindow(shelf_widget->GetNativeWindow());
|
| - EXPECT_FALSE(shelf_widget->CanActivate());
|
| -}
|
| -
|
| void TestLauncherAlignment(aura::Window* root,
|
| ShelfAlignment alignment,
|
| const std::string& expected) {
|
|
|