OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/logging.h" | 5 #include "base/logging.h" |
6 #include "content/public/browser/notification_service.h" | 6 #include "content/public/browser/notification_service.h" |
7 #include "content/public/browser/web_contents.h" | 7 #include "content/public/browser/web_contents.h" |
8 #include "content/public/test/test_utils.h" | 8 #include "content/public/test/test_utils.h" |
9 #include "extensions/browser/app_window/app_window.h" | 9 #include "extensions/browser/app_window/app_window.h" |
10 #include "extensions/browser/app_window/app_window_registry.h" | 10 #include "extensions/browser/app_window/app_window_registry.h" |
11 #include "extensions/browser/notification_types.h" | 11 #include "extensions/browser/notification_types.h" |
12 #include "extensions/shell/test/shell_apitest.h" | 12 #include "extensions/shell/test/shell_apitest.h" |
13 | 13 |
14 #if defined(USE_AURA) | 14 #if defined(USE_AURA) |
15 #include "ui/aura/window.h" | 15 #include "ui/aura/window.h" |
16 #endif | 16 #endif |
17 | 17 |
18 namespace extensions { | 18 namespace extensions { |
19 | 19 |
| 20 // Flaky on linux. See http://crbug.com/470873. |
| 21 #if defined(OS_LINUX) |
| 22 #define MAYBE_Basic DISABLED_Basic |
| 23 #else |
| 24 #define MAYBE_Basic Basic |
| 25 #endif |
20 // Test that we can open an app window and wait for it to load. | 26 // Test that we can open an app window and wait for it to load. |
21 IN_PROC_BROWSER_TEST_F(ShellApiTest, Basic) { | 27 IN_PROC_BROWSER_TEST_F(ShellApiTest, MAYBE_Basic) { |
22 ASSERT_TRUE(RunAppTest("platform_app")) << message_; | 28 ASSERT_TRUE(RunAppTest("platform_app")) << message_; |
23 | 29 |
24 // A window was created. | 30 // A window was created. |
25 AppWindow* app_window = | 31 AppWindow* app_window = |
26 AppWindowRegistry::Get(browser_context())->app_windows().front(); | 32 AppWindowRegistry::Get(browser_context())->app_windows().front(); |
27 ASSERT_TRUE(app_window); | 33 ASSERT_TRUE(app_window); |
28 | 34 |
29 // TOOD(yoz): Test for focus on Cocoa. | 35 // TOOD(yoz): Test for focus on Cocoa. |
30 // app_window->GetBaseWindow()->IsActive() is possible, although on Mac, | 36 // app_window->GetBaseWindow()->IsActive() is possible, although on Mac, |
31 // focus changes are asynchronous, so interactive_ui_tests are required. | 37 // focus changes are asynchronous, so interactive_ui_tests are required. |
32 #if defined(USE_AURA) | 38 #if defined(USE_AURA) |
33 // The web contents have focus. | 39 // The web contents have focus. |
34 EXPECT_TRUE(app_window->web_contents()->GetContentNativeView()->HasFocus()); | 40 EXPECT_TRUE(app_window->web_contents()->GetContentNativeView()->HasFocus()); |
35 #endif | 41 #endif |
36 } | 42 } |
37 | 43 |
38 } // namespace extensions | 44 } // namespace extensions |
OLD | NEW |