| 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/launcher.h" | 5 #include "apps/launcher.h" |
| 6 #include "apps/native_app_window.h" | 6 #include "apps/native_app_window.h" |
| 7 #include "apps/shell_window.h" | 7 #include "apps/shell_window.h" |
| 8 #include "apps/shell_window_registry.h" | 8 #include "apps/shell_window_registry.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 634 } | 634 } |
| 635 | 635 |
| 636 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MutationEventsDisabled) { | 636 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MutationEventsDisabled) { |
| 637 ASSERT_TRUE(RunPlatformAppTest("platform_apps/mutation_events")) << message_; | 637 ASSERT_TRUE(RunPlatformAppTest("platform_apps/mutation_events")) << message_; |
| 638 } | 638 } |
| 639 | 639 |
| 640 // Test that windows created with an id will remember and restore their | 640 // Test that windows created with an id will remember and restore their |
| 641 // geometry when opening new windows. | 641 // geometry when opening new windows. |
| 642 // Originally disabled due to flakiness (see http://crbug.com/155459) | 642 // Originally disabled due to flakiness (see http://crbug.com/155459) |
| 643 // but now because a regression breaks the test (http://crbug.com/160343). | 643 // but now because a regression breaks the test (http://crbug.com/160343). |
| 644 // | 644 #if defined(TOOLKIT_GTK) |
| 645 // TODO(erg): Now a linux_aura asan regression too: http://crbug.com/304555 | |
| 646 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | |
| 647 #define MAYBE_ShellWindowRestorePosition DISABLED_ShellWindowRestorePosition | 645 #define MAYBE_ShellWindowRestorePosition DISABLED_ShellWindowRestorePosition |
| 648 #else | 646 #else |
| 649 #define MAYBE_ShellWindowRestorePosition ShellWindowRestorePosition | 647 #define MAYBE_ShellWindowRestorePosition ShellWindowRestorePosition |
| 650 #endif | 648 #endif |
| 651 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, | 649 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, |
| 652 MAYBE_ShellWindowRestorePosition) { | 650 MAYBE_ShellWindowRestorePosition) { |
| 653 ASSERT_TRUE(RunPlatformAppTest("platform_apps/geometry")); | 651 ASSERT_TRUE(RunPlatformAppTest("platform_apps/geometry")); |
| 654 } | 652 } |
| 655 | 653 |
| 656 // This appears to be unreliable on linux. | 654 // This appears to be unreliable on linux. |
| (...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1139 | 1137 |
| 1140 while (!ContainsKey(opener_app_ids_, file_manager->id())) { | 1138 while (!ContainsKey(opener_app_ids_, file_manager->id())) { |
| 1141 content::RunAllPendingInMessageLoop(); | 1139 content::RunAllPendingInMessageLoop(); |
| 1142 } | 1140 } |
| 1143 } | 1141 } |
| 1144 | 1142 |
| 1145 #endif // defined(OS_CHROMEOS) | 1143 #endif // defined(OS_CHROMEOS) |
| 1146 | 1144 |
| 1147 | 1145 |
| 1148 } // namespace extensions | 1146 } // namespace extensions |
| OLD | NEW |