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

Unified Diff: chrome/browser/apps/app_interactive_uitest.cc

Issue 62763003: Leave fullscreen mode in an app window when ESC key is pressed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 1 month 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 | « apps/shell_window.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/apps/app_interactive_uitest.cc
diff --git a/chrome/browser/apps/app_interactive_uitest.cc b/chrome/browser/apps/app_interactive_uitest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e5583c1d9de48be5efb939599873efdd0d43d4c5
--- /dev/null
+++ b/chrome/browser/apps/app_interactive_uitest.cc
@@ -0,0 +1,102 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "apps/ui/native_app_window.h"
+#include "chrome/browser/apps/app_browsertest_util.h"
+#include "chrome/browser/extensions/extension_test_message_listener.h"
+#include "chrome/test/base/interactive_test_utils.h"
+
+using namespace apps;
+
+// Helper class that has to be created in the stack to check if the fullscreen
+// setting of a NativeWindow has changed since the creation of the object.
+class FullscreenChangeHelper {
+ public:
+ explicit FullscreenChangeHelper(NativeAppWindow* window)
+ : window_(window)
+ , initial_fullscreen_state_(window_->IsFullscreen())
koz (OOO until 15th September) 2013/11/19 07:29:57 nit: commas go on previous lines and variables lin
+ , already_changed_(false)
+ {}
koz (OOO until 15th September) 2013/11/19 07:29:57 nit: curlies should look like already_chang
+
+ bool DidFullscreenChanged() {
+ if (already_changed_)
+ return true;
+
+ if (initial_fullscreen_state_ != window_->IsFullscreen()) {
+ already_changed_ = true;
+ return true;
+ }
+
+ return false;
+ }
+
+ private:
+ NativeAppWindow* window_;
+ bool initial_fullscreen_state_;
koz (OOO until 15th September) 2013/11/19 07:29:57 nit: should only be one space between type and var
+ bool already_changed_;
+};
+
+class AppInteractiveTest : public extensions::PlatformAppBrowserTest {
+};
+
+IN_PROC_BROWSER_TEST_F(AppInteractiveTest, ESCLeavesFullscreenWindow) {
+ ExtensionTestMessageListener launched_listener("Launched", true);
+ LoadAndLaunchPlatformApp("leave_fullscreen");
+ ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
+
+ launched_listener.Reply("window");
+
+ {
+ FullscreenChangeHelper fs_changed(GetFirstShellWindow()->GetBaseWindow());
+
+ while (!fs_changed.DidFullscreenChanged())
+ content::RunAllPendingInMessageLoop();
koz (OOO until 15th September) 2013/11/19 07:29:57 If we have the app send a message after it goes in
+ }
+
+ ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync(
+ GetFirstShellWindow()->GetNativeWindow(), ui::VKEY_ESCAPE,
+ false, false, false, false));
+
+ {
+ FullscreenChangeHelper fs_changed(GetFirstShellWindow()->GetBaseWindow());
+
+ while (!fs_changed.DidFullscreenChanged())
+ content::RunAllPendingInMessageLoop();
+ }
+}
+
+IN_PROC_BROWSER_TEST_F(AppInteractiveTest, ESCLeavesFullscreenDOM) {
+ ExtensionTestMessageListener launched_listener("Launched", true);
+ LoadAndLaunchPlatformApp("leave_fullscreen");
+ ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
+
+ launched_listener.Reply("dom");
+
+ // Because the DOM way to go fullscreen requires user gesture, we simulate a
+ // key event to get the window entering in fullscreen mode. The reply will
+ // make the window listen for the key event. The reply will be sent to the
+ // renderer process such as the key event so they should arrive in the same
koz (OOO until 15th September) 2013/11/19 07:29:57 "renderer process before the keypress and should b
+ // order.
+ ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync(
+ GetFirstShellWindow()->GetNativeWindow(), ui::VKEY_A,
+ false, false, false, false));
+
+ {
+ FullscreenChangeHelper fs_changed(GetFirstShellWindow()->GetBaseWindow());
+
+ while (!fs_changed.DidFullscreenChanged())
+ content::RunAllPendingInMessageLoop();
+ }
+
+ ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync(
+ GetFirstShellWindow()->GetNativeWindow(), ui::VKEY_ESCAPE,
+ false, false, false, false));
+
+ {
+ FullscreenChangeHelper fs_changed(GetFirstShellWindow()->GetBaseWindow());
+
+ while (!fs_changed.DidFullscreenChanged())
+ content::RunAllPendingInMessageLoop();
+ }
+}
« no previous file with comments | « apps/shell_window.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698