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

Unified Diff: ash/launcher/launcher_unittest.cc

Issue 11451002: Focus launcher if spoken feedback is enabled and no other windows visible. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added end to end tests. 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
Index: ash/launcher/launcher_unittest.cc
diff --git a/ash/launcher/launcher_unittest.cc b/ash/launcher/launcher_unittest.cc
index 2c3f8a847eeaa6eb384bb36ac513d0e08682ba6d..ea9135b143486bff3c905575c019077d6f9ea776 100644
--- a/ash/launcher/launcher_unittest.cc
+++ b/ash/launcher/launcher_unittest.cc
@@ -10,6 +10,7 @@
#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"
@@ -77,4 +78,18 @@ TEST_F(LauncherTest, OpenBrowser) {
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

Powered by Google App Engine
This is Rietveld 408576698