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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 ASSERT_TRUE( | 242 ASSERT_TRUE( |
243 RunAppWindowAPITestAndWaitForRoundTrip("testBadging")) << message_; | 243 RunAppWindowAPITestAndWaitForRoundTrip("testBadging")) << message_; |
244 } | 244 } |
245 | 245 |
246 // TODO(benwells): Implement on Mac. | 246 // TODO(benwells): Implement on Mac. |
247 #if defined(USE_AURA) | 247 #if defined(USE_AURA) |
248 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) { | 248 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) { |
249 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_; | 249 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_; |
250 } | 250 } |
251 | 251 |
| 252 // TODO(benwells): Remove this test once all the things are merged together. It |
| 253 // is currently present as this feature was previously disabled on stable |
| 254 // channel, so the test is to ensure it has all been re-enabled properly. |
252 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColorsInStable) { | 255 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColorsInStable) { |
253 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE); | 256 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE); |
254 ASSERT_TRUE(RunAppWindowAPITest("testFrameColorsInStable")) << message_; | 257 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_; |
255 } | 258 } |
256 #endif | 259 #endif |
OLD | NEW |