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 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 103 WindowsApiAlwaysOnTopNoPermissions) { | 103 WindowsApiAlwaysOnTopNoPermissions) { |
| 104 EXPECT_TRUE(RunPlatformAppTest( | 104 EXPECT_TRUE(RunPlatformAppTest( |
| 105 "platform_apps/windows_api_always_on_top/no_permissions")) << message_; | 105 "platform_apps/windows_api_always_on_top/no_permissions")) << message_; |
| 106 } | 106 } |
| 107 | 107 |
| 108 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiGet) { | 108 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiGet) { |
| 109 EXPECT_TRUE(RunPlatformAppTest("platform_apps/windows_api_get")) | 109 EXPECT_TRUE(RunPlatformAppTest("platform_apps/windows_api_get")) |
| 110 << message_; | 110 << message_; |
| 111 } | 111 } |
| 112 | 112 |
| 113 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, | |
| 114 WindowsApiAlphaEnabledHasPermissions) { | |
| 115 #if defined(USE_ASH) | |
|
benwells
2014/08/05 23:37:05
Should this be USE_AURA?
garykac
2014/08/07 03:54:00
Yes, but it needs to exclude Linux while keeping C
| |
| 116 EXPECT_TRUE(RunPlatformAppTest( | |
| 117 "platform_apps/windows_api_alpha_enabled/has_permissions_has_alpha")) | |
| 118 << message_; | |
| 119 #else | |
| 120 EXPECT_TRUE(RunPlatformAppTest( | |
| 121 "platform_apps/windows_api_alpha_enabled/has_permissions_no_alpha")) | |
| 122 << message_; | |
| 123 #endif | |
| 124 } | |
| 125 | |
| 126 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, | |
| 127 WindowsApiAlphaEnabledNoPermissions) { | |
| 128 EXPECT_TRUE(RunPlatformAppTest( | |
| 129 "platform_apps/windows_api_alpha_enabled/no_permissions")) | |
| 130 << message_; | |
| 131 } | |
| 132 | |
| 133 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiAlphaEnabledInStable) { | |
| 134 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE); | |
| 135 EXPECT_TRUE(RunPlatformAppTestWithFlags( | |
| 136 "platform_apps/windows_api_alpha_enabled/in_stable", | |
| 137 // Ignore manifest warnings because the extension will not load at all | |
| 138 // in stable. | |
| 139 kFlagIgnoreManifestWarnings)) | |
| 140 << message_; | |
| 141 } | |
| 142 | |
| 113 } // namespace extensions | 143 } // namespace extensions |
| OLD | NEW |