| 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/shell_window.h" | 5 #include "apps/shell_window.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 "chrome/browser/extensions/extension_test_message_listener.h" | 8 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| 9 #include "chrome/browser/extensions/platform_app_browsertest_util.h" | 9 #include "chrome/browser/extensions/platform_app_browsertest_util.h" |
| 10 #include "chrome/browser/extensions/shell_window_registry.h" | 10 #include "chrome/browser/extensions/shell_window_registry.h" |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 base::RunLoop run_loop; | 116 base::RunLoop run_loop; |
| 117 run_loop.RunUntilIdle(); | 117 run_loop.RunUntilIdle(); |
| 118 } | 118 } |
| 119 ShellWindow* shell_window = GetFirstShellWindow(); | 119 ShellWindow* shell_window = GetFirstShellWindow(); |
| 120 ASSERT_TRUE(shell_window); | 120 ASSERT_TRUE(shell_window); |
| 121 EXPECT_NE(std::string::npos, | 121 EXPECT_NE(std::string::npos, |
| 122 shell_window->app_icon_url().spec().find("icon.png")); | 122 shell_window->app_icon_url().spec().find("icon.png")); |
| 123 EXPECT_EQ(1, test_observer->icon_updates()); | 123 EXPECT_EQ(1, test_observer->icon_updates()); |
| 124 } | 124 } |
| 125 | 125 |
| 126 // TODO(asargent) - Figure out what to do about the fact that minimize events | |
| 127 // don't work under ubuntu unity. | |
| 128 // (crbug.com/162794 and https://bugs.launchpad.net/unity/+bug/998073). | |
| 129 // TODO(linux_aura) http://crbug.com/163931 | 126 // TODO(linux_aura) http://crbug.com/163931 |
| 130 // Flaky on Mac, http://crbug.com/232330 | 127 // Flaky on Mac, http://crbug.com/232330 |
| 131 #if defined(TOOLKIT_VIEWS) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS) && de
fined(USE_AURA)) | 128 #if (defined(TOOLKIT_VIEWS) || defined(TOOLKIT_GTK)) && \ |
| 129 !(defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)) |
| 132 | 130 |
| 133 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiProperties) { | 131 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiProperties) { |
| 134 EXPECT_TRUE( | 132 EXPECT_TRUE( |
| 135 RunExtensionTest("platform_apps/windows_api_properties")) << message_; | 133 RunExtensionTest("platform_apps/windows_api_properties")) << message_; |
| 136 } | 134 } |
| 137 | 135 |
| 138 #endif // defined(TOOLKIT_VIEWS) | 136 #endif // defined(TOOLKIT_VIEWS) |
| 139 | 137 |
| 140 } // namespace extensions | 138 } // namespace extensions |
| OLD | NEW |