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 "chrome/browser/apps/app_browsertest_util.h" | 5 #include "chrome/browser/apps/app_browsertest_util.h" |
6 #include "chrome/browser/extensions/extension_test_message_listener.h" | |
7 #include "chrome/test/base/interactive_test_utils.h" | 6 #include "chrome/test/base/interactive_test_utils.h" |
8 #include "extensions/browser/app_window/native_app_window.h" | 7 #include "extensions/browser/app_window/native_app_window.h" |
| 8 #include "extensions/test/extension_test_message_listener.h" |
9 #include "extensions/test/result_catcher.h" | 9 #include "extensions/test/result_catcher.h" |
10 | 10 |
11 #if defined(OS_MACOSX) && !defined(OS_IOS) | 11 #if defined(OS_MACOSX) && !defined(OS_IOS) |
12 #include "base/mac/mac_util.h" | 12 #include "base/mac/mac_util.h" |
13 #endif | 13 #endif |
14 | 14 |
15 #if defined(OS_WIN) | 15 #if defined(OS_WIN) |
16 #include <windows.h> | 16 #include <windows.h> |
17 #include "ui/aura/window.h" | 17 #include "ui/aura/window.h" |
18 #include "ui/aura/window_tree_host.h" | 18 #include "ui/aura/window_tree_host.h" |
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
450 ASSERT_TRUE(RunAppWindowInteractiveTest("testCreate")) << message_; | 450 ASSERT_TRUE(RunAppWindowInteractiveTest("testCreate")) << message_; |
451 } | 451 } |
452 | 452 |
453 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, MAYBE_TestShow) { | 453 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, MAYBE_TestShow) { |
454 ASSERT_TRUE(RunAppWindowInteractiveTest("testShow")) << message_; | 454 ASSERT_TRUE(RunAppWindowInteractiveTest("testShow")) << message_; |
455 } | 455 } |
456 | 456 |
457 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, TestDrawAttention) { | 457 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, TestDrawAttention) { |
458 ASSERT_TRUE(RunAppWindowInteractiveTest("testDrawAttention")) << message_; | 458 ASSERT_TRUE(RunAppWindowInteractiveTest("testDrawAttention")) << message_; |
459 } | 459 } |
OLD | NEW |