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