| 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 "base/macros.h" |
| 6 #include "build/build_config.h" |
| 5 #include "chrome/browser/apps/app_browsertest_util.h" | 7 #include "chrome/browser/apps/app_browsertest_util.h" |
| 6 #include "chrome/browser/lifetime/application_lifetime.h" | 8 #include "chrome/browser/lifetime/application_lifetime.h" |
| 7 #include "chrome/browser/ui/browser_iterator.h" | 9 #include "chrome/browser/ui/browser_iterator.h" |
| 8 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
| 9 #include "chrome/test/base/interactive_test_utils.h" | 11 #include "chrome/test/base/interactive_test_utils.h" |
| 10 #include "extensions/browser/app_window/native_app_window.h" | 12 #include "extensions/browser/app_window/native_app_window.h" |
| 11 #include "extensions/test/extension_test_message_listener.h" | 13 #include "extensions/test/extension_test_message_listener.h" |
| 12 #include "extensions/test/result_catcher.h" | 14 #include "extensions/test/result_catcher.h" |
| 13 | 15 |
| 14 #if defined(OS_MACOSX) | 16 #if defined(OS_MACOSX) |
| (...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 573 // The app window will show after 3 seconds. | 575 // The app window will show after 3 seconds. |
| 574 ExtensionTestMessageListener shown_listener("Shown", false); | 576 ExtensionTestMessageListener shown_listener("Shown", false); |
| 575 launched_listener.Reply(""); | 577 launched_listener.Reply(""); |
| 576 EXPECT_TRUE(shown_listener.WaitUntilSatisfied()); | 578 EXPECT_TRUE(shown_listener.WaitUntilSatisfied()); |
| 577 EXPECT_FALSE(app_window->is_hidden()); | 579 EXPECT_FALSE(app_window->is_hidden()); |
| 578 EXPECT_TRUE(chrome::WillKeepAlive()); | 580 EXPECT_TRUE(chrome::WillKeepAlive()); |
| 579 app_window->GetBaseWindow()->Close(); | 581 app_window->GetBaseWindow()->Close(); |
| 580 } | 582 } |
| 581 | 583 |
| 582 #endif | 584 #endif |
| OLD | NEW |