OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "apps/ui/native_app_window.h" | |
6 #include "chrome/browser/apps/app_browsertest_util.h" | 5 #include "chrome/browser/apps/app_browsertest_util.h" |
7 #include "chrome/browser/extensions/extension_test_message_listener.h" | 6 #include "chrome/browser/extensions/extension_test_message_listener.h" |
8 #include "chrome/test/base/interactive_test_utils.h" | 7 #include "chrome/test/base/interactive_test_utils.h" |
| 8 #include "extensions/browser/app_window/native_app_window.h" |
9 | 9 |
10 #if defined(OS_MACOSX) && !defined(OS_IOS) | 10 #if defined(OS_MACOSX) && !defined(OS_IOS) |
11 #include "base/mac/mac_util.h" | 11 #include "base/mac/mac_util.h" |
12 #endif | 12 #endif |
13 | 13 |
14 #if defined(OS_WIN) | 14 #if defined(OS_WIN) |
15 #include <windows.h> | 15 #include <windows.h> |
16 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
17 #include "ui/aura/window_tree_host.h" | 17 #include "ui/aura/window_tree_host.h" |
18 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" | 18 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" |
19 #include "ui/views/win/hwnd_message_handler_delegate.h" | 19 #include "ui/views/win/hwnd_message_handler_delegate.h" |
20 #include "ui/views/win/hwnd_util.h" | 20 #include "ui/views/win/hwnd_util.h" |
21 #endif | 21 #endif |
22 | 22 |
23 using apps::NativeAppWindow; | 23 using extensions::NativeAppWindow; |
24 | 24 |
25 // Helper class that has to be created in the stack to check if the fullscreen | 25 // Helper class that has to be created in the stack to check if the fullscreen |
26 // setting of a NativeWindow has changed since the creation of the object. | 26 // setting of a NativeWindow has changed since the creation of the object. |
27 class FullscreenChangeWaiter { | 27 class FullscreenChangeWaiter { |
28 public: | 28 public: |
29 explicit FullscreenChangeWaiter(NativeAppWindow* window) | 29 explicit FullscreenChangeWaiter(NativeAppWindow* window) |
30 : window_(window), | 30 : window_(window), |
31 initial_fullscreen_state_(window_->IsFullscreen()) {} | 31 initial_fullscreen_state_(window_->IsFullscreen()) {} |
32 | 32 |
33 void Wait() { | 33 void Wait() { |
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
432 #define MAYBE_TestShow TestShow | 432 #define MAYBE_TestShow TestShow |
433 #endif | 433 #endif |
434 | 434 |
435 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, MAYBE_TestCreate) { | 435 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, MAYBE_TestCreate) { |
436 ASSERT_TRUE(RunAppWindowInteractiveTest("testCreate")) << message_; | 436 ASSERT_TRUE(RunAppWindowInteractiveTest("testCreate")) << message_; |
437 } | 437 } |
438 | 438 |
439 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, MAYBE_TestShow) { | 439 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, MAYBE_TestShow) { |
440 ASSERT_TRUE(RunAppWindowInteractiveTest("testShow")) << message_; | 440 ASSERT_TRUE(RunAppWindowInteractiveTest("testShow")) << message_; |
441 } | 441 } |
OLD | NEW |