diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 22:11:36 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 22:11:36 +0000 |
| commit | a5c58ab8f902bf502b7ab3516a737e9d0362f148 (patch) | |
| tree | 35c199ecff53157e5fad76c39b98fa65f534912f /ash | |
| parent | 84034a92dc557cf5c3dfafdc5f1d96a93be71ac5 (diff) | |
| download | chromium_src-a5c58ab8f902bf502b7ab3516a737e9d0362f148.zip chromium_src-a5c58ab8f902bf502b7ab3516a737e9d0362f148.tar.gz chromium_src-a5c58ab8f902bf502b7ab3516a737e9d0362f148.tar.bz2 | |
Remove deprecated test: ShelfWidgetTest::ActivateAsFallback
BUG=285364
Review URL: https://codereview.chromium.org/133273017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245348 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shelf/shelf_widget_unittest.cc | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/ash/shelf/shelf_widget_unittest.cc b/ash/shelf/shelf_widget_unittest.cc index 50fce9d..ed613bb 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) { |