| Index: chrome/browser/apps/custom_launcher_page_browsertest_views.cc
|
| diff --git a/chrome/browser/apps/custom_launcher_page_browsertest_views.cc b/chrome/browser/apps/custom_launcher_page_browsertest_views.cc
|
| index 6ac62479689a7c559b65ac0010b11cbacd0ff5cf..f39ec2e52b06b5d906e2292f9c3f4b99cc18ddf6 100644
|
| --- a/chrome/browser/apps/custom_launcher_page_browsertest_views.cc
|
| +++ b/chrome/browser/apps/custom_launcher_page_browsertest_views.cc
|
| @@ -315,10 +315,11 @@ IN_PROC_BROWSER_TEST_F(CustomLauncherPageBrowserTest, LauncherPageSubpages) {
|
| contents_view->IsStateActive(app_list::AppListModel::STATE_START));
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(CustomLauncherPageBrowserTest,
|
| - LauncherPageShow) {
|
| +IN_PROC_BROWSER_TEST_F(CustomLauncherPageBrowserTest, LauncherPageShowAndHide) {
|
| const base::string16 kLauncherPageShowScript =
|
| base::ASCIIToUTF16("chrome.launcherPage.show();");
|
| + const base::string16 kLauncherPageHideScript =
|
| + base::ASCIIToUTF16("hideCustomLauncherPage()");
|
|
|
| LoadAndLaunchPlatformApp(kCustomLauncherPagePath, "Launched");
|
| app_list::AppListView* app_list_view = GetAppListView();
|
| @@ -362,6 +363,29 @@ IN_PROC_BROWSER_TEST_F(CustomLauncherPageBrowserTest,
|
| EXPECT_TRUE(contents_view->IsStateActive(
|
| app_list::AppListModel::STATE_CUSTOM_LAUNCHER_PAGE));
|
| }
|
| +
|
| + // Ensure launcherPage.hide() hides the launcher page when it's showing.
|
| + {
|
| + ExtensionTestMessageListener listener("onPageProgressAt0", false);
|
| + custom_page_frame->ExecuteJavaScript(kLauncherPageHideScript);
|
| +
|
| + listener.WaitUntilSatisfied();
|
| +
|
| + EXPECT_TRUE(
|
| + contents_view->IsStateActive(app_list::AppListModel::STATE_START));
|
| + }
|
| +
|
| + // Nothing should happen if hide() is called from the apps page.
|
| + {
|
| + contents_view->SetActiveState(app_list::AppListModel::STATE_APPS, false);
|
| +
|
| + ExtensionTestMessageListener listener("launcherPageHidden", false);
|
| + custom_page_frame->ExecuteJavaScript(kLauncherPageHideScript);
|
| + listener.WaitUntilSatisfied();
|
| +
|
| + EXPECT_TRUE(
|
| + contents_view->IsStateActive(app_list::AppListModel::STATE_APPS));
|
| + }
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(CustomLauncherPageBrowserTest, LauncherPageSetEnabled) {
|
|
|