| 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/lifetime/application_lifetime.h" | 6 #include "chrome/browser/lifetime/application_lifetime.h" |
| 7 #include "chrome/browser/lifetime/browser_keep_alive.h" |
| 7 #include "chrome/browser/ui/browser_iterator.h" | 8 #include "chrome/browser/ui/browser_iterator.h" |
| 8 #include "chrome/browser/ui/browser_window.h" | 9 #include "chrome/browser/ui/browser_window.h" |
| 9 #include "chrome/test/base/interactive_test_utils.h" | 10 #include "chrome/test/base/interactive_test_utils.h" |
| 10 #include "extensions/browser/app_window/native_app_window.h" | 11 #include "extensions/browser/app_window/native_app_window.h" |
| 11 #include "extensions/test/extension_test_message_listener.h" | 12 #include "extensions/test/extension_test_message_listener.h" |
| 12 #include "extensions/test/result_catcher.h" | 13 #include "extensions/test/result_catcher.h" |
| 13 | 14 |
| 14 #if defined(OS_MACOSX) | 15 #if defined(OS_MACOSX) |
| 15 #include "base/mac/mac_util.h" | 16 #include "base/mac/mac_util.h" |
| 16 #include "ui/base/test/scoped_fake_nswindow_fullscreen.h" | 17 #include "ui/base/test/scoped_fake_nswindow_fullscreen.h" |
| (...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 519 private: | 520 private: |
| 520 DISALLOW_COPY_AND_ASSIGN(AppWindowHiddenKeepAliveTest); | 521 DISALLOW_COPY_AND_ASSIGN(AppWindowHiddenKeepAliveTest); |
| 521 }; | 522 }; |
| 522 | 523 |
| 523 // A window that becomes hidden should not keep Chrome alive. | 524 // A window that becomes hidden should not keep Chrome alive. |
| 524 IN_PROC_BROWSER_TEST_F(AppWindowHiddenKeepAliveTest, ShownThenHidden) { | 525 IN_PROC_BROWSER_TEST_F(AppWindowHiddenKeepAliveTest, ShownThenHidden) { |
| 525 LoadAndLaunchPlatformApp("minimal", "Launched"); | 526 LoadAndLaunchPlatformApp("minimal", "Launched"); |
| 526 for (chrome::BrowserIterator it; !it.done(); it.Next()) | 527 for (chrome::BrowserIterator it; !it.done(); it.Next()) |
| 527 it->window()->Close(); | 528 it->window()->Close(); |
| 528 | 529 |
| 529 EXPECT_TRUE(chrome::WillKeepAlive()); | 530 EXPECT_TRUE(browser_lifetime::WillKeepAlive()); |
| 530 GetFirstAppWindow()->Hide(); | 531 GetFirstAppWindow()->Hide(); |
| 531 EXPECT_FALSE(chrome::WillKeepAlive()); | 532 EXPECT_FALSE(browser_lifetime::WillKeepAlive()); |
| 532 } | 533 } |
| 533 | 534 |
| 534 // A window that is hidden but re-shown should still keep Chrome alive. | 535 // A window that is hidden but re-shown should still keep Chrome alive. |
| 535 IN_PROC_BROWSER_TEST_F(AppWindowHiddenKeepAliveTest, ShownThenHiddenThenShown) { | 536 IN_PROC_BROWSER_TEST_F(AppWindowHiddenKeepAliveTest, ShownThenHiddenThenShown) { |
| 536 LoadAndLaunchPlatformApp("minimal", "Launched"); | 537 LoadAndLaunchPlatformApp("minimal", "Launched"); |
| 537 AppWindow* app_window = GetFirstAppWindow(); | 538 AppWindow* app_window = GetFirstAppWindow(); |
| 538 app_window->Hide(); | 539 app_window->Hide(); |
| 539 app_window->Show(AppWindow::SHOW_ACTIVE); | 540 app_window->Show(AppWindow::SHOW_ACTIVE); |
| 540 | 541 |
| 541 EXPECT_TRUE(chrome::WillKeepAlive()); | 542 EXPECT_TRUE(browser_lifetime::WillKeepAlive()); |
| 542 for (chrome::BrowserIterator it; !it.done(); it.Next()) | 543 for (chrome::BrowserIterator it; !it.done(); it.Next()) |
| 543 it->window()->Close(); | 544 it->window()->Close(); |
| 544 EXPECT_TRUE(chrome::WillKeepAlive()); | 545 EXPECT_TRUE(browser_lifetime::WillKeepAlive()); |
| 545 app_window->GetBaseWindow()->Close(); | 546 app_window->GetBaseWindow()->Close(); |
| 546 } | 547 } |
| 547 | 548 |
| 548 // A window that is created hidden and stays hidden should not keep Chrome | 549 // A window that is created hidden and stays hidden should not keep Chrome |
| 549 // alive. | 550 // alive. |
| 550 IN_PROC_BROWSER_TEST_F(AppWindowHiddenKeepAliveTest, StaysHidden) { | 551 IN_PROC_BROWSER_TEST_F(AppWindowHiddenKeepAliveTest, StaysHidden) { |
| 551 LoadAndLaunchPlatformApp("hidden", "Launched"); | 552 LoadAndLaunchPlatformApp("hidden", "Launched"); |
| 552 AppWindow* app_window = GetFirstAppWindow(); | 553 AppWindow* app_window = GetFirstAppWindow(); |
| 553 EXPECT_TRUE(app_window->is_hidden()); | 554 EXPECT_TRUE(app_window->is_hidden()); |
| 554 | 555 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 568 | 569 |
| 569 // Close all browser windows. | 570 // Close all browser windows. |
| 570 for (chrome::BrowserIterator it; !it.done(); it.Next()) | 571 for (chrome::BrowserIterator it; !it.done(); it.Next()) |
| 571 it->window()->Close(); | 572 it->window()->Close(); |
| 572 | 573 |
| 573 // The app window will show after 3 seconds. | 574 // The app window will show after 3 seconds. |
| 574 ExtensionTestMessageListener shown_listener("Shown", false); | 575 ExtensionTestMessageListener shown_listener("Shown", false); |
| 575 launched_listener.Reply(""); | 576 launched_listener.Reply(""); |
| 576 EXPECT_TRUE(shown_listener.WaitUntilSatisfied()); | 577 EXPECT_TRUE(shown_listener.WaitUntilSatisfied()); |
| 577 EXPECT_FALSE(app_window->is_hidden()); | 578 EXPECT_FALSE(app_window->is_hidden()); |
| 578 EXPECT_TRUE(chrome::WillKeepAlive()); | 579 EXPECT_TRUE(browser_lifetime::WillKeepAlive()); |
| 579 app_window->GetBaseWindow()->Close(); | 580 app_window->GetBaseWindow()->Close(); |
| 580 } | 581 } |
| 581 | 582 |
| 582 #endif | 583 #endif |
| OLD | NEW |