Chromium Code Reviews| 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/app_window.h" | 5 #include "apps/app_window.h" |
| 6 #include "apps/app_window_registry.h" | 6 #include "apps/app_window_registry.h" |
| 7 #include "apps/ui/native_app_window.h" | 7 #include "apps/ui/native_app_window.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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 101 WindowsApiAlwaysOnTopNoPermissions) { | 101 WindowsApiAlwaysOnTopNoPermissions) { |
| 102 EXPECT_TRUE(RunPlatformAppTest( | 102 EXPECT_TRUE(RunPlatformAppTest( |
| 103 "platform_apps/windows_api_always_on_top/no_permissions")) << message_; | 103 "platform_apps/windows_api_always_on_top/no_permissions")) << message_; |
| 104 } | 104 } |
| 105 | 105 |
| 106 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiGet) { | 106 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiGet) { |
| 107 EXPECT_TRUE(RunPlatformAppTest("platform_apps/windows_api_get")) | 107 EXPECT_TRUE(RunPlatformAppTest("platform_apps/windows_api_get")) |
| 108 << message_; | 108 << message_; |
| 109 } | 109 } |
| 110 | 110 |
| 111 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, | |
| 112 WindowsApiAlphaEnabledHasPermissions) { | |
|
benwells
2014/05/12 04:25:17
Please also add a test for running this in stable
garykac
2014/07/09 23:19:21
Done, but on Stable requesting app.window.shape pr
| |
| 113 #if defined(USE_AURA) | |
|
benwells
2014/05/12 04:25:17
So ... if aura is enabled, alphaEnabled will be tr
garykac
2014/07/09 23:19:21
Changed all the #ifdefs to use USE_ASH.
| |
| 114 EXPECT_TRUE(RunPlatformAppTest( | |
| 115 "platform_apps/windows_api_alpha_enabled/has_permissions_aura")) | |
| 116 << message_; | |
| 117 #else | |
| 118 EXPECT_TRUE(RunPlatformAppTest( | |
| 119 "platform_apps/windows_api_alpha_enabled/has_permissions_no_aura")) | |
| 120 << message_; | |
| 121 #endif | |
| 122 } | |
| 123 | |
| 124 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, | |
| 125 WindowsApiAlphaEnabledNoPermissions) { | |
| 126 EXPECT_TRUE(RunPlatformAppTest( | |
| 127 "platform_apps/windows_api_alpha_enabled/no_permissions")) | |
| 128 << message_; | |
| 129 } | |
| 130 | |
| 111 } // namespace extensions | 131 } // namespace extensions |
| OLD | NEW |