ash: Move CustomTabSessionImpl out of ChromeNewWindowClient

Move CustomTabSessionImpl to its own file. Also, factor out code that
can be used by other classes that create and manage an ARC Custom Tab.

BUG=b:64863368
TEST=Deploy Chrome to DUT and verify ARC Custom Tabs work correctly
R=djacobo@chromium.org, hashimoto@chromium.org, oshima@chromium.org

Change-Id: Ib11a233aa04ac52cfe73abaa9ecbb145791aa263
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1728446Reviewed-by: David Jacobo <djacobo@chromium.org>
Reviewed-by: Mitsuru Oshima (Slow - traveling) <oshima@chromium.org>
Reviewed-by: Ryo Hashimoto <hashimoto@chromium.org>
Commit-Queue: Jesse Schettler <jschettler@chromium.org>
Auto-Submit: Jesse Schettler <jschettler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#683483}

chrome/browser/chromeos/BUILD.gn

@@ -550,6 +550,8 @@ source_set("chromeos") {
     "arc/intent_helper/arc_intent_picker_app_fetcher.h",
     "arc/intent_helper/arc_settings_service.cc",
     "arc/intent_helper/arc_settings_service.h",
+    "arc/intent_helper/custom_tab_session_impl.cc",
+    "arc/intent_helper/custom_tab_session_impl.h",
     "arc/intent_helper/open_with_menu.cc",
     "arc/intent_helper/open_with_menu.h",
     "arc/intent_helper/start_smart_selection_action_menu.cc",

chrome/browser/chromeos/arc/intent_helper/custom_tab_session_impl.cc

+// Copyright 2019 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 "chrome/browser/chromeos/arc/intent_helper/custom_tab_session_impl.h"
+
+#include <utility>
+
+#include "ash/public/cpp/arc_custom_tab.h"
+#include "base/bind.h"
+#include "base/metrics/histogram_macros.h"
+#include "content/public/browser/web_contents.h"
+#include "mojo/public/cpp/bindings/interface_request.h"
+#include "ui/aura/window.h"
+
+// static
+arc::mojom::CustomTabSessionPtr CustomTabSessionImpl::Create(
+    std::unique_ptr<content::WebContents> web_contents,
+    std::unique_ptr<ash::ArcCustomTab> custom_tab) {
+  if (!custom_tab)
+    return nullptr;
+
+  // This object will be deleted when the mojo connection is closed.
+  auto* tab =
+      new CustomTabSessionImpl(std::move(web_contents), std::move(custom_tab));
+  arc::mojom::CustomTabSessionPtr ptr;
+  tab->Bind(&ptr);
+  return ptr;
+}
+
+CustomTabSessionImpl::CustomTabSessionImpl(
+    std::unique_ptr<content::WebContents> web_contents,
+    std::unique_ptr<ash::ArcCustomTab> custom_tab)
+    : ArcCustomTabModalDialogHost(std::move(custom_tab),
+                                  std::move(web_contents)),
+      binding_(this),
+      weak_ptr_factory_(this) {
+  aura::Window* window = web_contents_->GetNativeView();
+  custom_tab_->Attach(window);
+  window->Show();
+}
+
+CustomTabSessionImpl::~CustomTabSessionImpl() {
+  // Keep in sync with ArcCustomTabsSessionEndReason in
+  // tools/metrics/histograms/enums.xml.
+  enum class SessionEndReason {
+    CLOSED = 0,
+    FORWARDED_TO_NORMAL_TAB = 1,
+    kMaxValue = FORWARDED_TO_NORMAL_TAB,
+  } session_end_reason = forwarded_to_normal_tab_
+                             ? SessionEndReason::FORWARDED_TO_NORMAL_TAB
+                             : SessionEndReason::CLOSED;
+  UMA_HISTOGRAM_ENUMERATION("Arc.CustomTabs.SessionEndReason",
+                            session_end_reason);
+  auto elapsed = lifetime_timer_.Elapsed();
+  UMA_HISTOGRAM_LONG_TIMES("Arc.CustomTabs.SessionLifetime2.All", elapsed);
+  switch (session_end_reason) {
+    case SessionEndReason::CLOSED:
+      UMA_HISTOGRAM_LONG_TIMES("Arc.CustomTabs.SessionLifetime2.Closed",
+                               elapsed);
+      break;
+    case SessionEndReason::FORWARDED_TO_NORMAL_TAB:
+      UMA_HISTOGRAM_LONG_TIMES(
+          "Arc.CustomTabs.SessionLifetime2.ForwardedToNormalTab", elapsed);
+      break;
+  }
+}
+
+void CustomTabSessionImpl::OnOpenInChromeClicked() {
+  forwarded_to_normal_tab_ = true;
+}
+
+void CustomTabSessionImpl::Bind(arc::mojom::CustomTabSessionPtr* ptr) {
+  binding_.Bind(mojo::MakeRequest(ptr));
+  binding_.set_connection_error_handler(base::BindOnce(
+      &CustomTabSessionImpl::Close, weak_ptr_factory_.GetWeakPtr()));
+}
+
+// Deletes this object when the mojo connection is closed.
+void CustomTabSessionImpl::Close() {
+  delete this;
+}

chrome/browser/chromeos/arc/intent_helper/custom_tab_session_impl.h

+// Copyright 2019 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.
+
+#ifndef CHROME_BROWSER_CHROMEOS_ARC_INTENT_HELPER_CUSTOM_TAB_SESSION_IMPL_H_
+#define CHROME_BROWSER_CHROMEOS_ARC_INTENT_HELPER_CUSTOM_TAB_SESSION_IMPL_H_
+
+#include <memory>
+
+#include "base/macros.h"
+#include "base/memory/weak_ptr.h"
+#include "base/timer/elapsed_timer.h"
+#include "chrome/browser/ui/ash/arc_custom_tab_modal_dialog_host.h"
+#include "components/arc/common/intent_helper.mojom.h"
+#include "mojo/public/cpp/bindings/binding.h"
+
+namespace ash {
+class ArcCustomTab;
+}  // namespace ash
+
+namespace content {
+class WebContents;
+}  // namespace content
+
+// Implementation of CustomTabSession interface.
+class CustomTabSessionImpl : public arc::mojom::CustomTabSession,
+                             public ArcCustomTabModalDialogHost {
+ public:
+  static arc::mojom::CustomTabSessionPtr Create(
+      std::unique_ptr<content::WebContents> web_contents,
+      std::unique_ptr<ash::ArcCustomTab> custom_tab);
+
+  // arc::mojom::CustomTabSession:
+  void OnOpenInChromeClicked() override;
+
+ private:
+  CustomTabSessionImpl(std::unique_ptr<content::WebContents> web_contents,
+                       std::unique_ptr<ash::ArcCustomTab> custom_tab);
+  ~CustomTabSessionImpl() override;
+
+  void Bind(arc::mojom::CustomTabSessionPtr* ptr);
+
+  void Close();
+
+  // Used to bind the CustomTabSession interface implementation to a message
+  // pipe.
+  mojo::Binding<arc::mojom::CustomTabSession> binding_;
+
+  // Tracks the lifetime of the ARC Custom Tab session.
+  base::ElapsedTimer lifetime_timer_;
+
+  // Set to true when the user requests to view the web contents in a normal
+  // Chrome tab instead of an ARC Custom Tab.
+  bool forwarded_to_normal_tab_ = false;
+
+  // Note: This should remain the last member so it'll be destroyed and
+  // invalidate its weak pointers before any other members are destroyed.
+  base::WeakPtrFactory<CustomTabSessionImpl> weak_ptr_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(CustomTabSessionImpl);
+};
+
+#endif  // CHROME_BROWSER_CHROMEOS_ARC_INTENT_HELPER_CUSTOM_TAB_SESSION_IMPL_H_

chrome/browser/ui/BUILD.gn

@@ -1427,6 +1427,8 @@ jumbo_split_static_library("ui") {
       "ash/ambient/photo_controller_impl.h",
       "ash/arc_chrome_actions_client.cc",
       "ash/arc_chrome_actions_client.h",
+      "ash/arc_custom_tab_modal_dialog_host.cc",
+      "ash/arc_custom_tab_modal_dialog_host.h",
       "ash/ash_shell_init.cc",
       "ash/ash_shell_init.h",
       "ash/ash_util.cc",

chrome/browser/ui/ash/arc_custom_tab_modal_dialog_host.cc

+// Copyright 2019 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 "chrome/browser/ui/ash/arc_custom_tab_modal_dialog_host.h"
+
+#include <utility>
+
+#include "ash/public/cpp/arc_custom_tab.h"
+#include "components/web_modal/modal_dialog_host.h"
+#include "components/web_modal/web_contents_modal_dialog_manager.h"
+#include "content/public/browser/web_contents.h"
+#include "ui/gfx/geometry/point.h"
+#include "ui/gfx/geometry/size.h"
+
+ArcCustomTabModalDialogHost::ArcCustomTabModalDialogHost(
+    std::unique_ptr<ash::ArcCustomTab> custom_tab,
+    std::unique_ptr<content::WebContents> web_contents)
+    : custom_tab_(std::move(custom_tab)),
+      web_contents_(std::move(web_contents)) {
+  // Attach any required WebContents helpers. Browser tabs automatically get
+  // them attached in TabHelpers::AttachTabHelpers.
+  web_modal::WebContentsModalDialogManager::CreateForWebContents(
+      web_contents_.get());
+  web_modal::WebContentsModalDialogManager::FromWebContents(web_contents_.get())
+      ->SetDelegate(this);
+}
+
+ArcCustomTabModalDialogHost::~ArcCustomTabModalDialogHost() = default;
+
+web_modal::WebContentsModalDialogHost*
+ArcCustomTabModalDialogHost::GetWebContentsModalDialogHost() {
+  return this;
+}
+
+gfx::NativeView ArcCustomTabModalDialogHost::GetHostView() const {
+  return custom_tab_->GetHostView();
+}
+
+gfx::Point ArcCustomTabModalDialogHost::GetDialogPosition(
+    const gfx::Size& size) {
+  return web_contents_->GetViewBounds().origin();
+}
+
+gfx::Size ArcCustomTabModalDialogHost::GetMaximumDialogSize() {
+  return web_contents_->GetViewBounds().size();
+}
+
+void ArcCustomTabModalDialogHost::AddObserver(
+    web_modal::ModalDialogHostObserver* observer) {}
+
+void ArcCustomTabModalDialogHost::RemoveObserver(
+    web_modal::ModalDialogHostObserver* observer) {}

chrome/browser/ui/ash/arc_custom_tab_modal_dialog_host.h

+// Copyright 2019 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.
+
+#ifndef CHROME_BROWSER_UI_ASH_ARC_CUSTOM_TAB_MODAL_DIALOG_HOST_H_
+#define CHROME_BROWSER_UI_ASH_ARC_CUSTOM_TAB_MODAL_DIALOG_HOST_H_
+
+#include <memory>
+
+#include "base/macros.h"
+#include "components/web_modal/web_contents_modal_dialog_host.h"
+#include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
+#include "ui/gfx/native_widget_types.h"
+
+namespace ash {
+class ArcCustomTab;
+}  // namespace ash
+
+namespace contents {
+class WebContents;
+}  // namespace contents
+
+namespace gfx {
+class Point;
+class Size;
+}  // namespace gfx
+
+namespace web_modal {
+class ModalDialogHostObserver;
+}  // namespace web_modal
+
+// Implements a WebContentsModalDialogHost for an ARC Custom Tab. This allows a
+// web contents modal dialog to be drawn in the ARC Custom Tab.
+class ArcCustomTabModalDialogHost
+    : public web_modal::WebContentsModalDialogHost,
+      public web_modal::WebContentsModalDialogManagerDelegate {
+ public:
+  ArcCustomTabModalDialogHost(
+      std::unique_ptr<ash::ArcCustomTab> custom_tab,
+      std::unique_ptr<content::WebContents> web_contents);
+  ~ArcCustomTabModalDialogHost() override = 0;
+
+  // web_modal::WebContentsModalDialogManagerDelegate:
+  web_modal::WebContentsModalDialogHost* GetWebContentsModalDialogHost()
+      override;
+
+  // web_modal::WebContentsModalDialogHost:
+  gfx::NativeView GetHostView() const override;
+  gfx::Point GetDialogPosition(const gfx::Size& size) override;
+  gfx::Size GetMaximumDialogSize() override;
+  void AddObserver(web_modal::ModalDialogHostObserver* observer) override;
+  void RemoveObserver(web_modal::ModalDialogHostObserver* observer) override;
+
+ protected:
+  std::unique_ptr<ash::ArcCustomTab> custom_tab_;
+  std::unique_ptr<content::WebContents> web_contents_;
+
+  DISALLOW_COPY_AND_ASSIGN(ArcCustomTabModalDialogHost);
+};
+
+#endif  // CHROME_BROWSER_UI_ASH_ARC_CUSTOM_TAB_MODAL_DIALOG_HOST_H_