| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/launcher.h" | 7 #include "apps/launcher.h" |
| 8 #include "apps/ui/native_app_window.h" | 8 #include "apps/ui/native_app_window.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 1033 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1044 app_loaded_observer.Wait(); | 1044 app_loaded_observer.Wait(); |
| 1045 ASSERT_TRUE(should_install.seen()); | 1045 ASSERT_TRUE(should_install.seen()); |
| 1046 | 1046 |
| 1047 ExtensionTestMessageListener launched_listener("Launched", false); | 1047 ExtensionTestMessageListener launched_listener("Launched", false); |
| 1048 OpenApplication(AppLaunchParams( | 1048 OpenApplication(AppLaunchParams( |
| 1049 browser()->profile(), extension, LAUNCH_CONTAINER_NONE, NEW_WINDOW)); | 1049 browser()->profile(), extension, LAUNCH_CONTAINER_NONE, NEW_WINDOW)); |
| 1050 | 1050 |
| 1051 ASSERT_TRUE(launched_listener.WaitUntilSatisfied()); | 1051 ASSERT_TRUE(launched_listener.WaitUntilSatisfied()); |
| 1052 } | 1052 } |
| 1053 | 1053 |
| 1054 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, Messaging) { | 1054 // Fails on Win7. http://crbug.com/171450 |
| 1055 #if defined(OS_WIN) |
| 1056 #define MAYBE_Messaging DISABLED_Messaging |
| 1057 #else |
| 1058 #define MAYBE_Messaging Messaging |
| 1059 #endif |
| 1060 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_Messaging) { |
| 1055 ExtensionApiTest::ResultCatcher result_catcher; | 1061 ExtensionApiTest::ResultCatcher result_catcher; |
| 1056 LoadAndLaunchPlatformApp("messaging/app2", "Ready"); | 1062 LoadAndLaunchPlatformApp("messaging/app2", "Ready"); |
| 1057 LoadAndLaunchPlatformApp("messaging/app1", "Launched"); | 1063 LoadAndLaunchPlatformApp("messaging/app1", "Launched"); |
| 1058 EXPECT_TRUE(result_catcher.GetNextResult()); | 1064 EXPECT_TRUE(result_catcher.GetNextResult()); |
| 1059 } | 1065 } |
| 1060 | 1066 |
| 1061 // TODO(linux_aura) http://crbug.com/163931 | 1067 // TODO(linux_aura) http://crbug.com/163931 |
| 1062 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) | 1068 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA) |
| 1063 #define MAYBE_WebContentsHasFocus DISABLED_WebContentsHasFocus | 1069 #define MAYBE_WebContentsHasFocus DISABLED_WebContentsHasFocus |
| 1064 #else | 1070 #else |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1284 LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched"); | 1290 LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched"); |
| 1285 ASSERT_TRUE(extension); | 1291 ASSERT_TRUE(extension); |
| 1286 ASSERT_EQ(extension_id, extension->id()); | 1292 ASSERT_EQ(extension_id, extension->id()); |
| 1287 | 1293 |
| 1288 ExtensionApiTest::ResultCatcher result_catcher; | 1294 ExtensionApiTest::ResultCatcher result_catcher; |
| 1289 EXPECT_TRUE(result_catcher.GetNextResult()); | 1295 EXPECT_TRUE(result_catcher.GetNextResult()); |
| 1290 } | 1296 } |
| 1291 } | 1297 } |
| 1292 | 1298 |
| 1293 } // namespace extensions | 1299 } // namespace extensions |
| OLD | NEW |