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/app_window_geometry_cache.h" | 5 #include "apps/app_window_geometry_cache.h" |
6 #include "chrome/browser/apps/app_browsertest_util.h" | 6 #include "chrome/browser/apps/app_browsertest_util.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/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
10 #include "chrome/browser/ui/extensions/application_launch.h" | 10 #include "chrome/browser/ui/extensions/application_launch.h" |
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 | 208 |
209 ResultCatcher catcher; | 209 ResultCatcher catcher; |
210 geometry_listener.Reply(""); | 210 geometry_listener.Reply(""); |
211 ASSERT_TRUE(catcher.GetNextResult()); | 211 ASSERT_TRUE(catcher.GetNextResult()); |
212 } | 212 } |
213 | 213 |
214 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestBadging) { | 214 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestBadging) { |
215 ASSERT_TRUE( | 215 ASSERT_TRUE( |
216 RunAppWindowAPITestAndWaitForRoundTrip("testBadging")) << message_; | 216 RunAppWindowAPITestAndWaitForRoundTrip("testBadging")) << message_; |
217 } | 217 } |
| 218 |
| 219 // TODO(benwells): Implement on Mac. |
| 220 #if defined(USE_AURA) |
| 221 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) { |
| 222 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_; |
| 223 } |
| 224 |
| 225 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColorsInStable) { |
| 226 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE); |
| 227 ASSERT_TRUE(RunAppWindowAPITest("testFrameColorsInStable")) << message_; |
| 228 } |
| 229 #endif |
OLD | NEW |