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

Unified Diff: ash/launcher/launcher_unittest.cc

Issue 11594004: Revert 173417 - Broke on win_aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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 | « ash/launcher/launcher.cc ('k') | ash/wm/ash_activation_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_unittest.cc
===================================================================
--- ash/launcher/launcher_unittest.cc (revision 173420)
+++ ash/launcher/launcher_unittest.cc (working copy)
@@ -10,7 +10,6 @@
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/launcher_view_test_api.h"
-#include "ash/wm/window_util.h"
#include "ui/views/view.h"
#include "ui/views/widget/widget.h"
@@ -78,18 +77,4 @@
ASSERT_EQ(--button_count, test.GetButtonCount());
}
-// Launcher can't be activated on mouse click, but it is activable from
-// the focus cycler or as fallback.
-TEST_F(LauncherTest, ActivateAsFallback) {
- Launcher* launcher = Launcher::ForPrimaryDisplay();
- views::Widget* launcher_widget = launcher->widget();
- EXPECT_FALSE(launcher_widget->CanActivate());
-
- launcher->WillActivateAsFallback();
- EXPECT_TRUE(launcher_widget->CanActivate());
-
- wm::ActivateWindow(launcher_widget->GetNativeWindow());
- EXPECT_FALSE(launcher_widget->CanActivate());
-}
-
} // namespace ash
« no previous file with comments | « ash/launcher/launcher.cc ('k') | ash/wm/ash_activation_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698