| 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 "chrome/browser/apps/app_browsertest_util.h" | 5 #include "chrome/browser/apps/app_browsertest_util.h" |
| 6 #include "chrome/browser/extensions/extension_test_message_listener.h" | 6 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| 7 #include "chrome/test/base/interactive_test_utils.h" | 7 #include "chrome/test/base/interactive_test_utils.h" |
| 8 #include "extensions/browser/app_window/native_app_window.h" | 8 #include "extensions/browser/app_window/native_app_window.h" |
| 9 | 9 |
| 10 #if defined(OS_MACOSX) && !defined(OS_IOS) | 10 #if defined(OS_MACOSX) && !defined(OS_IOS) |
| (...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 336 | 336 |
| 337 ASSERT_TRUE(second_key_listener.WaitUntilSatisfied()); | 337 ASSERT_TRUE(second_key_listener.WaitUntilSatisfied()); |
| 338 | 338 |
| 339 // We assume that at that point, if we had to leave fullscreen, we should be. | 339 // We assume that at that point, if we had to leave fullscreen, we should be. |
| 340 // However, by nature, we can not guarantee that and given that we do test | 340 // However, by nature, we can not guarantee that and given that we do test |
| 341 // that nothing happens, we might end up with random-success when the feature | 341 // that nothing happens, we might end up with random-success when the feature |
| 342 // is broken. | 342 // is broken. |
| 343 EXPECT_TRUE(GetFirstAppWindow()->GetBaseWindow()->IsFullscreen()); | 343 EXPECT_TRUE(GetFirstAppWindow()->GetBaseWindow()->IsFullscreen()); |
| 344 } | 344 } |
| 345 | 345 |
| 346 #if defined(OS_MACOSX) | 346 #if defined(OS_MACOSX) || defined(OS_WIN) |
| 347 // http://crbug.com/404081 | 347 // http://crbug.com/404081 |
| 348 #define MAYBE_TestInnerBounds DISABLED_TestInnerBounds | 348 #define MAYBE_TestInnerBounds DISABLED_TestInnerBounds |
| 349 #else | 349 #else |
| 350 #define MAYBE_TestInnerBounds TestInnerBounds | 350 #define MAYBE_TestInnerBounds TestInnerBounds |
| 351 #endif | 351 #endif |
| 352 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, MAYBE_TestInnerBounds) { | 352 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, MAYBE_TestInnerBounds) { |
| 353 ASSERT_TRUE(RunAppWindowInteractiveTest("testInnerBounds")) << message_; | 353 ASSERT_TRUE(RunAppWindowInteractiveTest("testInnerBounds")) << message_; |
| 354 } | 354 } |
| 355 | 355 |
| 356 void AppWindowInteractiveTest::TestOuterBoundsHelper( | 356 void AppWindowInteractiveTest::TestOuterBoundsHelper( |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 449 ASSERT_TRUE(RunAppWindowInteractiveTest("testCreate")) << message_; | 449 ASSERT_TRUE(RunAppWindowInteractiveTest("testCreate")) << message_; |
| 450 } | 450 } |
| 451 | 451 |
| 452 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, MAYBE_TestShow) { | 452 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, MAYBE_TestShow) { |
| 453 ASSERT_TRUE(RunAppWindowInteractiveTest("testShow")) << message_; | 453 ASSERT_TRUE(RunAppWindowInteractiveTest("testShow")) << message_; |
| 454 } | 454 } |
| 455 | 455 |
| 456 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, TestDrawAttention) { | 456 IN_PROC_BROWSER_TEST_F(AppWindowInteractiveTest, TestDrawAttention) { |
| 457 ASSERT_TRUE(RunAppWindowInteractiveTest("testDrawAttention")) << message_; | 457 ASSERT_TRUE(RunAppWindowInteractiveTest("testDrawAttention")) << message_; |
| 458 } | 458 } |
| OLD | NEW |