| 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 "chrome/browser/apps/app_browsertest_util.h" | 6 #include "chrome/browser/apps/app_browsertest_util.h" |
| 6 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
| 7 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 8 #include "chrome/browser/ui/extensions/app_launch_params.h" | 9 #include "chrome/browser/ui/extensions/app_launch_params.h" |
| 9 #include "chrome/browser/ui/extensions/application_launch.h" | 10 #include "chrome/browser/ui/extensions/application_launch.h" |
| 10 #include "content/public/browser/notification_service.h" | 11 #include "content/public/browser/notification_service.h" |
| 11 #include "content/public/test/test_utils.h" | 12 #include "content/public/test/test_utils.h" |
| 12 #include "extensions/browser/app_window/app_window_geometry_cache.h" | 13 #include "extensions/browser/app_window/app_window_geometry_cache.h" |
| 13 #include "extensions/common/constants.h" | 14 #include "extensions/common/constants.h" |
| 14 #include "extensions/common/extension.h" | 15 #include "extensions/common/extension.h" |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) { | 257 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestFrameColors) { |
| 257 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_; | 258 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_; |
| 258 } | 259 } |
| 259 #endif | 260 #endif |
| 260 | 261 |
| 261 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestVisibleOnAllWorkspaces) { | 262 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestVisibleOnAllWorkspaces) { |
| 262 ASSERT_TRUE( | 263 ASSERT_TRUE( |
| 263 RunAppWindowAPITestAndWaitForRoundTrip("testVisibleOnAllWorkspaces")) | 264 RunAppWindowAPITestAndWaitForRoundTrip("testVisibleOnAllWorkspaces")) |
| 264 << message_; | 265 << message_; |
| 265 } | 266 } |
| OLD | NEW |