Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(274)

Unified Diff: ash/shelf/shelf_widget_unittest.cc

Issue 133273017: Remove deprecated test: ShelfWidgetTest::ActivateAsFallback (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698