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 30 matching lines...) Expand all Loading... |
41 int icon_updates_; | 41 int icon_updates_; |
42 | 42 |
43 DISALLOW_COPY_AND_ASSIGN(TestAppWindowRegistryObserver); | 43 DISALLOW_COPY_AND_ASSIGN(TestAppWindowRegistryObserver); |
44 }; | 44 }; |
45 | 45 |
46 } // namespace | 46 } // namespace |
47 | 47 |
48 namespace extensions { | 48 namespace extensions { |
49 | 49 |
50 // Tests chrome.app.window.setIcon. | 50 // Tests chrome.app.window.setIcon. |
51 IN_PROC_BROWSER_TEST_F(ExperimentalPlatformAppBrowserTest, WindowsApiSetIcon) { | 51 #if defined(OS_WIN) || defined(OS_LINUX) |
| 52 // http://crbug.com/396466 |
| 53 #define MAYBE_WindowsApiSetIcon DISABLED_WindowsApiSetIcon |
| 54 #else |
| 55 #define MAYBE_WindowsApiSetIcon WindowsApiSetIcon |
| 56 #endif |
| 57 IN_PROC_BROWSER_TEST_F(ExperimentalPlatformAppBrowserTest, |
| 58 MAYBE_WindowsApiSetIcon) { |
52 scoped_ptr<TestAppWindowRegistryObserver> test_observer( | 59 scoped_ptr<TestAppWindowRegistryObserver> test_observer( |
53 new TestAppWindowRegistryObserver(browser()->profile())); | 60 new TestAppWindowRegistryObserver(browser()->profile())); |
54 LoadAndLaunchPlatformApp("windows_api_set_icon", "IconSet"); | 61 LoadAndLaunchPlatformApp("windows_api_set_icon", "IconSet"); |
55 EXPECT_EQ(0, test_observer->icon_updates()); | 62 EXPECT_EQ(0, test_observer->icon_updates()); |
56 // Now wait until the WebContent has decoded the icon and chrome has | 63 // Now wait until the WebContent has decoded the icon and chrome has |
57 // processed it. This needs to be in a loop since the renderer runs in a | 64 // processed it. This needs to be in a loop since the renderer runs in a |
58 // different process. | 65 // different process. |
59 while (test_observer->icon_updates() < 1) { | 66 while (test_observer->icon_updates() < 1) { |
60 base::RunLoop run_loop; | 67 base::RunLoop run_loop; |
61 run_loop.RunUntilIdle(); | 68 run_loop.RunUntilIdle(); |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
99 EXPECT_TRUE(RunPlatformAppTest( | 106 EXPECT_TRUE(RunPlatformAppTest( |
100 "platform_apps/windows_api_always_on_top/no_permissions")) << message_; | 107 "platform_apps/windows_api_always_on_top/no_permissions")) << message_; |
101 } | 108 } |
102 | 109 |
103 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiGet) { | 110 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiGet) { |
104 EXPECT_TRUE(RunPlatformAppTest("platform_apps/windows_api_get")) | 111 EXPECT_TRUE(RunPlatformAppTest("platform_apps/windows_api_get")) |
105 << message_; | 112 << message_; |
106 } | 113 } |
107 | 114 |
108 } // namespace extensions | 115 } // namespace extensions |
OLD | NEW |