OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/native_app_window.h" | 5 #include "apps/native_app_window.h" |
6 #include "apps/shell_window.h" | 6 #include "apps/shell_window.h" |
7 #include "apps/shell_window_registry.h" | 7 #include "apps/shell_window_registry.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
10 #include "chrome/browser/apps/app_browsertest_util.h" | 10 #include "chrome/browser/apps/app_browsertest_util.h" |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
130 // Flaky on Mac, http://crbug.com/232330 | 130 // Flaky on Mac, http://crbug.com/232330 |
131 #if defined(TOOLKIT_VIEWS) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS) && de
fined(USE_AURA)) | 131 #if defined(TOOLKIT_VIEWS) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS) && de
fined(USE_AURA)) |
132 | 132 |
133 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiProperties) { | 133 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiProperties) { |
134 EXPECT_TRUE( | 134 EXPECT_TRUE( |
135 RunExtensionTest("platform_apps/windows_api_properties")) << message_; | 135 RunExtensionTest("platform_apps/windows_api_properties")) << message_; |
136 } | 136 } |
137 | 137 |
138 #endif // defined(TOOLKIT_VIEWS) | 138 #endif // defined(TOOLKIT_VIEWS) |
139 | 139 |
| 140 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiAlwaysOnTop) { |
| 141 EXPECT_TRUE(RunPlatformAppTest("platform_apps/windows_api_always_on_top")) |
| 142 << message_; |
| 143 } |
| 144 |
140 } // namespace extensions | 145 } // namespace extensions |
OLD | NEW |