Add launcherPage.hide() API.

chrome/browser/apps/custom_launcher_page_browsertest_views.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
@@ skipping 297 matching lines @@
 
   // Once all subpages are popped, the start page should show.
   EXPECT_TRUE(contents_view->Back());
 
   // Immediately finish the animation.
   contents_view->Layout();
   EXPECT_TRUE(
       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();
   app_list::ContentsView* contents_view =
       app_list_view->app_list_main_view()->contents_view();
 
   views::WebView* custom_page_view = static_cast<views::WebView*>(
       contents_view->custom_page_view()->custom_launcher_page_contents());
 
   content::RenderFrameHost* custom_page_frame =
@@ skipping 23 matching lines @@
     custom_page_frame->ExecuteJavaScript(kLauncherPageShowScript);
 
     listener.WaitUntilSatisfied();
 
     // The app list view will have changed on ChromeOS.
     app_list_view = GetAppListView();
     contents_view = app_list_view->app_list_main_view()->contents_view();
     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) {
   LoadAndLaunchPlatformApp(kCustomLauncherPagePath, "Launched");
   app_list::AppListView* app_list_view = GetAppListView();
   app_list::AppListModel* model = app_list_view->app_list_main_view()->model();
   app_list::ContentsView* contents_view =
       app_list_view->app_list_main_view()->contents_view();
 
   views::View* custom_page_view = contents_view->custom_page_view();
@@ skipping 49 matching lines @@
   // And in reverse.
   EXPECT_EQ(
       search_box_textfield,
       app_list_view->GetFocusManager()->GetNextFocusableView(
           custom_page_webview, custom_page_webview->GetWidget(), true, false));
   EXPECT_EQ(custom_page_webview,
             app_list_view->GetFocusManager()->GetNextFocusableView(
                 search_box_textfield, search_box_textfield->GetWidget(), true,
                 false));
 }