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/string_number_conversions.h" | 5 #include "base/string_number_conversions.h" |
6 #include "chrome/browser/extensions/extension_test_message_listener.h" | 6 #include "chrome/browser/extensions/extension_test_message_listener.h" |
7 #include "chrome/browser/extensions/platform_app_browsertest_util.h" | 7 #include "chrome/browser/extensions/platform_app_browsertest_util.h" |
8 #include "chrome/browser/ui/base_window.h" | 8 #include "chrome/browser/ui/base_window.h" |
9 #include "chrome/browser/ui/extensions/shell_window.h" | 9 #include "chrome/browser/ui/extensions/shell_window.h" |
10 #include "ui/gfx/rect.h" | 10 #include "ui/gfx/rect.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 // with exactly the bounds we set. Is it a bug in our shell window | 28 // with exactly the bounds we set. Is it a bug in our shell window |
29 // implementation? crbug.com/160252 | 29 // implementation? crbug.com/160252 |
30 #ifdef TOOLKIT_GTK | 30 #ifdef TOOLKIT_GTK |
31 int slop = 50; | 31 int slop = 50; |
32 #else | 32 #else |
33 int slop = 0; | 33 int slop = 0; |
34 #endif // !TOOLKIT_GTK | 34 #endif // !TOOLKIT_GTK |
35 | 35 |
36 ready_listener.Reply(base::IntToString(slop)); | 36 ready_listener.Reply(base::IntToString(slop)); |
37 ASSERT_TRUE(success_listener.WaitUntilSatisfied()); | 37 ASSERT_TRUE(success_listener.WaitUntilSatisfied()); |
| 38 |
| 39 CloseShellWindowsAndWaitForAppToExit(); |
38 } | 40 } |
39 | 41 |
40 // TODO(asargent) - Fix onMinimzed event on OSX (crbug.com/162793) and figure | 42 // TODO(asargent) - Fix onMinimzed event on OSX (crbug.com/162793) and figure |
41 // out what to do about the fact that minimize events don't work under ubuntu | 43 // out what to do about the fact that minimize events don't work under ubuntu |
42 // unity (crbug.com/162794 and https://bugs.launchpad.net/unity/+bug/998073). | 44 // unity (crbug.com/162794 and https://bugs.launchpad.net/unity/+bug/998073). |
43 #if defined(TOOLKIT_VIEWS) | 45 #if defined(TOOLKIT_VIEWS) |
44 | 46 |
45 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiProperties) { | 47 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiProperties) { |
46 EXPECT_TRUE( | 48 EXPECT_TRUE( |
47 RunExtensionTest("platform_apps/windows_api_properties")) << message_; | 49 RunPlatformAppTest("platform_apps/windows_api_properties")) << message_; |
48 } | 50 } |
49 | 51 |
50 #endif // defined(TOOLKIT_VIEWS) | 52 #endif // defined(TOOLKIT_VIEWS) |
51 | 53 |
52 } // namespace extensions | 54 } // namespace extensions |
OLD | NEW |