| 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 "base/macros.h" | 5 #include "base/macros.h" |
| 6 #include "base/run_loop.h" | 6 #include "base/run_loop.h" |
| 7 #include "base/strings/string_number_conversions.h" | 7 #include "base/strings/string_number_conversions.h" |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "chrome/browser/apps/app_browsertest_util.h" | 9 #include "chrome/browser/apps/app_browsertest_util.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 RunPlatformAppTest("platform_apps/windows_api_shape/no_permission")) | 127 RunPlatformAppTest("platform_apps/windows_api_shape/no_permission")) |
| 128 << message_; | 128 << message_; |
| 129 } | 129 } |
| 130 | 130 |
| 131 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, | 131 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, |
| 132 WindowsApiAlphaEnabledHasPermissions) { | 132 WindowsApiAlphaEnabledHasPermissions) { |
| 133 const char* no_alpha_dir = | 133 const char* no_alpha_dir = |
| 134 "platform_apps/windows_api_alpha_enabled/has_permissions_no_alpha"; | 134 "platform_apps/windows_api_alpha_enabled/has_permissions_no_alpha"; |
| 135 const char* test_dir = no_alpha_dir; | 135 const char* test_dir = no_alpha_dir; |
| 136 | 136 |
| 137 #if defined(USE_AURA) && (defined(OS_CHROMEOS) || !defined(OS_LINUX)) | 137 #if defined(USE_AURA) && (defined(OS_CHROMEOS) || defined(OS_LINUX)) |
| 138 test_dir = | 138 test_dir = |
| 139 "platform_apps/windows_api_alpha_enabled/has_permissions_has_alpha"; | 139 "platform_apps/windows_api_alpha_enabled/has_permissions_has_alpha"; |
| 140 #if defined(OS_WIN) | 140 #if defined(OS_WIN) |
| 141 if (!ui::win::IsAeroGlassEnabled()) { | 141 if (!ui::win::IsAeroGlassEnabled()) { |
| 142 test_dir = no_alpha_dir; | 142 test_dir = no_alpha_dir; |
| 143 } | 143 } |
| 144 #endif // OS_WIN | 144 #endif // OS_WIN |
| 145 #endif // USE_AURA && (OS_CHROMEOS || !OS_LINUX) | 145 #endif // USE_AURA && (OS_CHROMEOS || !OS_LINUX) |
| 146 | 146 |
| 147 EXPECT_TRUE(RunPlatformAppTest(test_dir)) << message_; | 147 EXPECT_TRUE(RunPlatformAppTest(test_dir)) << message_; |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 command_line->AppendSwitchASCII(switches::kAppId, | 210 command_line->AppendSwitchASCII(switches::kAppId, |
| 211 "jkghodnilhceideoidjikpgommlajknk"); | 211 "jkghodnilhceideoidjikpgommlajknk"); |
| 212 | 212 |
| 213 EXPECT_TRUE(RunComponentExtensionTest( | 213 EXPECT_TRUE(RunComponentExtensionTest( |
| 214 "platform_apps/windows_api_ime/forced_app_mode_not_fullscreen")) | 214 "platform_apps/windows_api_ime/forced_app_mode_not_fullscreen")) |
| 215 << message_; | 215 << message_; |
| 216 } | 216 } |
| 217 #endif // OS_CHROMEOS | 217 #endif // OS_CHROMEOS |
| 218 | 218 |
| 219 } // namespace extensions | 219 } // namespace extensions |
| OLD | NEW |