diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-05 22:14:52 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-05 22:14:52 +0000 |
| commit | 37533821562c1f1c48c5c89f6161175b4e6ad569 (patch) | |
| tree | 30dea38eb263292d4a853e9af9ee5379e38a246a /ash/shelf/shelf_widget_unittest.cc | |
| parent | d2066ecd0fc75fb50a737e6d4b36a8d652bff6c5 (diff) | |
| download | chromium_src-37533821562c1f1c48c5c89f6161175b4e6ad569.zip chromium_src-37533821562c1f1c48c5c89f6161175b4e6ad569.tar.gz chromium_src-37533821562c1f1c48c5c89f6161175b4e6ad569.tar.bz2 | |
Remove old activation code and disable-focus-controller flags
BUG=285339,285364
Review URL: https://chromiumcodereview.appspot.com/23874013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shelf/shelf_widget_unittest.cc')
| -rw-r--r-- | ash/shelf/shelf_widget_unittest.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ash/shelf/shelf_widget_unittest.cc b/ash/shelf/shelf_widget_unittest.cc index 6168787..2de02bc 100644 --- a/ash/shelf/shelf_widget_unittest.cc +++ b/ash/shelf/shelf_widget_unittest.cc @@ -39,11 +39,9 @@ typedef test::AshTestBase ShelfWidgetTest; // Launcher can't be activated on mouse click, but it is activable from // the focus cycler or as fallback. -TEST_F(ShelfWidgetTest, ActivateAsFallback) { - // TODO(mtomasz): make this test work with the FocusController. - if (views::corewm::UseFocusController()) - return; - +// TODO(mtomasz): make this test work with the FocusController. +// crbug.com/285364. +TEST_F(ShelfWidgetTest, DISABLED_ActivateAsFallback) { Launcher* launcher = Launcher::ForPrimaryDisplay(); ShelfWidget* shelf_widget = launcher->shelf_widget(); EXPECT_FALSE(shelf_widget->CanActivate()); |