Reland "Enable Picture-in-Picture for chrome apps."

This CL enables Picture-in-Picture in chrome apps by implementing
EnterPictureInPicture and ExitPictureInPicture in AppDelegate.

Bug: 863309
Change-Id: I67ddd28ad84c658b0ce992be7ef8cbff3f1a9f9e
Reviewed-on: https://chromium-review.googlesource.com/1181124
Commit-Queue: François Beaufort <beaufort.francois@gmail.com>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#586649}

chrome/browser/apps/platform_apps/app_browsertest.cc

@@ -44,6 +44,7 @@
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/host_zoom_map.h"
+#include "content/public/browser/picture_in_picture_window_controller.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/test/browser_test_utils.h"
@@ -1423,4 +1424,28 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
   ASSERT_TRUE(synthetic_wheel_listener.WaitUntilSatisfied());
 }
 
+// Tests that platform apps can enter and exit Picture-in-Picture.
+IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, PictureInPicture) {
+  LoadAndLaunchPlatformApp("picture_in_picture", "Launched");
+
+  WebContents* web_contents = GetFirstAppWindowWebContents();
+  ASSERT_TRUE(web_contents);
+  content::PictureInPictureWindowController* window_controller =
+      content::PictureInPictureWindowController::GetOrCreateForWebContents(
+          web_contents);
+  ASSERT_TRUE(window_controller->GetWindowForTesting());
+  EXPECT_FALSE(window_controller->GetWindowForTesting()->IsVisible());
+
+  bool result = false;
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      web_contents, "enterPictureInPicture();", &result));
+  EXPECT_TRUE(result);
+  EXPECT_TRUE(window_controller->GetWindowForTesting()->IsVisible());
+
+  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
+      web_contents, "exitPictureInPicture();", &result));
+  EXPECT_TRUE(result);
+  EXPECT_FALSE(window_controller->GetWindowForTesting()->IsVisible());
+}
+
 }  // namespace extensions

chrome/browser/ui/apps/chrome_app_delegate.cc

@@ -16,6 +16,7 @@
 #include "chrome/browser/favicon/favicon_utils.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
+#include "chrome/browser/picture_in_picture/picture_in_picture_window_manager.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/shell_integration.h"
@@ -366,6 +367,18 @@ bool ChromeAppDelegate::TakeFocus(content::WebContents* web_contents,
 #endif
 }
 
+gfx::Size ChromeAppDelegate::EnterPictureInPicture(
+    content::WebContents* web_contents,
+    const viz::SurfaceId& surface_id,
+    const gfx::Size& natural_size) {
+  return PictureInPictureWindowManager::GetInstance()->EnterPictureInPicture(
+      web_contents, surface_id, natural_size);
+}
+
+void ChromeAppDelegate::ExitPictureInPicture() {
+  PictureInPictureWindowManager::GetInstance()->ExitPictureInPicture();
+}
+
 void ChromeAppDelegate::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {

chrome/browser/ui/apps/chrome_app_delegate.h

@@ -74,6 +74,10 @@ class ChromeAppDelegate : public extensions::AppDelegate,
   void OnHide() override;
   void OnShow() override;
   bool TakeFocus(content::WebContents* web_contents, bool reverse) override;
+  gfx::Size EnterPictureInPicture(content::WebContents* web_contents,
+                                  const viz::SurfaceId& surface_id,
+                                  const gfx::Size& natural_size) override;
+  void ExitPictureInPicture() override;
 
   // content::NotificationObserver:
   void Observe(int type,

chrome/test/data/extensions/platform_apps/picture_in_picture/main.html

+<!--
+ * Copyright 2018 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.
+-->
+<html>
+<body>
+<script src="main.js"></script>
+</body>
+</html>

chrome/test/data/extensions/platform_apps/picture_in_picture/main.js

+// Copyright 2018 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.
+
+const video = document.createElement('video');
+video.src = chrome.runtime.getURL('bear.webm');
+video.load();
+video.addEventListener('loadedmetadata', function() {
+  chrome.test.sendMessage('Launched');
+});
+
+function enterPictureInPicture() {
+  video.requestPictureInPicture()
+      .catch(error => { window.domAutomationController.send(false); });
+
+  video.addEventListener('enterpictureinpicture', function(pipWindow) {
+    window.domAutomationController.send(
+        pipWindow.width != 0 && pipWindow.height != 0);
+  }, { once: true });
+}
+
+function exitPictureInPicture() {
+  document.exitPictureInPicture()
+      .catch(error => { window.domAutomationController.send(false); });
+
+  video.addEventListener('leavepictureinpicture', function() {
+    window.domAutomationController.send(true);
+  }, { once: true });
+}

chrome/test/data/extensions/platform_apps/picture_in_picture/manifest.json

+{
+  "name": "Platform App Test: Picture-in-Picture",
+  "manifest_version": 2,
+  "version": "1",
+  "app": {
+    "background": {
+      "scripts": ["test.js"]
+    }
+  }
+}

chrome/test/data/extensions/platform_apps/picture_in_picture/test.js

+// Copyright 2018 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.
+
+chrome.app.runtime.onLaunched.addListener(function() {
+  chrome.app.window.create('main.html', {}, function () {});
+});

extensions/browser/app_window/app_delegate.h

@@ -25,6 +25,10 @@ class Rect;
 class Size;
 }
 
+namespace viz {
+class SurfaceId;
+}
+
 namespace extensions {
 
 class Extension;
@@ -89,6 +93,17 @@ class AppDelegate {
   // a chance to handle the focus change.
   // Return whether focus has been handled.
   virtual bool TakeFocus(content::WebContents* web_contents, bool reverse) = 0;
+
+  // Notifies the Picture-in-Picture controller that there is a new player
+  // entering Picture-in-Picture.
+  // Returns the size of the Picture-in-Picture window.
+  virtual gfx::Size EnterPictureInPicture(content::WebContents* web_contents,
+                                          const viz::SurfaceId& surface_id,
+                                          const gfx::Size& natural_size) = 0;
+
+  // Updates the Picture-in-Picture controller with a signal that
+  // Picture-in-Picture mode has ended.
+  virtual void ExitPictureInPicture() = 0;
 };
 
 }  // namespace extensions

extensions/browser/app_window/app_window.cc

@@ -439,6 +439,16 @@ bool AppWindow::TakeFocus(WebContents* source, bool reverse) {
   return app_delegate_->TakeFocus(source, reverse);
 }
 
+gfx::Size AppWindow::EnterPictureInPicture(const viz::SurfaceId& surface_id,
+                                           const gfx::Size& natural_size) {
+  return app_delegate_->EnterPictureInPicture(web_contents(), surface_id,
+                                              natural_size);
+}
+
+void AppWindow::ExitPictureInPicture() {
+  app_delegate_->ExitPictureInPicture();
+}
+
 bool AppWindow::OnMessageReceived(const IPC::Message& message,
                                   content::RenderFrameHost* render_frame_host) {
   bool handled = true;

extensions/browser/app_window/app_window.h

@@ -444,6 +444,9 @@ class AppWindow : public content::WebContentsDelegate,
       content::RenderFrameHost* frame,
       const content::BluetoothChooser::EventHandler& event_handler) override;
   bool TakeFocus(content::WebContents* source, bool reverse) override;
+  gfx::Size EnterPictureInPicture(const viz::SurfaceId& surface_id,
+                                  const gfx::Size& natural_size) override;
+  void ExitPictureInPicture() override;
 
   // content::WebContentsObserver implementation.
   bool OnMessageReceived(const IPC::Message& message,

extensions/shell/browser/shell_app_delegate.cc

@@ -106,4 +106,16 @@ bool ShellAppDelegate::TakeFocus(content::WebContents* web_contents,
   return false;
 }
 
+gfx::Size ShellAppDelegate::EnterPictureInPicture(
+    content::WebContents* web_contents,
+    const viz::SurfaceId& surface_id,
+    const gfx::Size& natural_size) {
+  NOTREACHED();
+  return gfx::Size();
+}
+
+void ShellAppDelegate::ExitPictureInPicture() {
+  NOTREACHED();
+}
+
 }  // namespace extensions

extensions/shell/browser/shell_app_delegate.h

@@ -52,6 +52,10 @@ class ShellAppDelegate : public AppDelegate {
   void OnHide() override {}
   void OnShow() override {}
   bool TakeFocus(content::WebContents* web_contents, bool reverse) override;
+  gfx::Size EnterPictureInPicture(content::WebContents* web_contents,
+                                  const viz::SurfaceId& surface_id,
+                                  const gfx::Size& natural_size) override;
+  void ExitPictureInPicture() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellAppDelegate);

testing/buildbot/filters/chromeos.mash.fyi.browser_tests.filter

@@ -279,6 +279,7 @@
 -PictureInPictureWindowControllerBrowserTest.*
 -ControlPictureInPictureWindowControllerBrowserTest.*
 -BrowserActionApiTest.TestPictureInPictureOnBrowserActionIconClick
+-PlatformAppBrowserTest.PictureInPicture
 
 # These started failing with the switch to ws2.
 # https:://crbug.com/855767