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 "build/build_config.h" | 5 #include "build/build_config.h" |
6 #include "chrome/browser/apps/app_browsertest_util.h" | 6 #include "chrome/browser/apps/app_browsertest_util.h" |
7 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
9 #include "chrome/browser/ui/extensions/app_launch_params.h" | 9 #include "chrome/browser/ui/extensions/app_launch_params.h" |
10 #include "chrome/browser/ui/extensions/application_launch.h" | 10 #include "chrome/browser/ui/extensions/application_launch.h" |
11 #include "content/public/browser/notification_service.h" | 11 #include "content/public/browser/notification_service.h" |
| 12 #include "content/public/browser/notification_types.h" |
12 #include "content/public/test/test_utils.h" | 13 #include "content/public/test/test_utils.h" |
13 #include "extensions/browser/app_window/app_window_geometry_cache.h" | 14 #include "extensions/browser/app_window/app_window_geometry_cache.h" |
14 #include "extensions/common/constants.h" | 15 #include "extensions/common/constants.h" |
15 #include "extensions/common/extension.h" | 16 #include "extensions/common/extension.h" |
16 #include "extensions/test/extension_test_message_listener.h" | 17 #include "extensions/test/extension_test_message_listener.h" |
17 #include "extensions/test/result_catcher.h" | 18 #include "extensions/test/result_catcher.h" |
18 | 19 |
19 using extensions::AppWindowGeometryCache; | 20 using extensions::AppWindowGeometryCache; |
20 using extensions::ResultCatcher; | 21 using extensions::ResultCatcher; |
21 | 22 |
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
257 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) { | 258 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) { |
258 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_; | 259 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_; |
259 } | 260 } |
260 #endif | 261 #endif |
261 | 262 |
262 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestVisibleOnAllWorkspaces) { | 263 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestVisibleOnAllWorkspaces) { |
263 ASSERT_TRUE( | 264 ASSERT_TRUE( |
264 RunAppWindowAPITestAndWaitForRoundTrip("testVisibleOnAllWorkspaces")) | 265 RunAppWindowAPITestAndWaitForRoundTrip("testVisibleOnAllWorkspaces")) |
265 << message_; | 266 << message_; |
266 } | 267 } |
OLD | NEW |