From ccb439efb088c990b41a6ceb5b1b330c8c27a1aa Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Sun, 8 Nov 2020 07:17:12 -0500
Subject: applets: Remove the previous web browser applet implementation

---
 src/core/frontend/applets/web_browser.h | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'src/core/frontend/applets/web_browser.h')

diff --git a/src/core/frontend/applets/web_browser.h b/src/core/frontend/applets/web_browser.h
index 110e33bc4..6e5f4d93d 100644
--- a/src/core/frontend/applets/web_browser.h
+++ b/src/core/frontend/applets/web_browser.h
@@ -5,24 +5,17 @@
 #pragma once
 
 #include <functional>
-#include <string_view>
 
 namespace Core::Frontend {
 
 class WebBrowserApplet {
 public:
     virtual ~WebBrowserApplet();
-
-    virtual void OpenPageLocal(std::string_view url, std::function<void()> unpack_romfs_callback,
-                               std::function<void()> finished_callback) = 0;
 };
 
 class DefaultWebBrowserApplet final : public WebBrowserApplet {
 public:
     ~DefaultWebBrowserApplet() override;
-
-    void OpenPageLocal(std::string_view url, std::function<void()> unpack_romfs_callback,
-                       std::function<void()> finished_callback) override;
 };
 
 } // namespace Core::Frontend
-- 
cgit v1.2.3


From d6d1a8e02c99b369fdbd9df2d3bdb68832f3d614 Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Sun, 15 Nov 2020 09:00:19 -0500
Subject: applets/web: Implement the default web browser applet frontend

---
 src/core/frontend/applets/web_browser.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/core/frontend/applets/web_browser.h')

diff --git a/src/core/frontend/applets/web_browser.h b/src/core/frontend/applets/web_browser.h
index 6e5f4d93d..2ccefc68f 100644
--- a/src/core/frontend/applets/web_browser.h
+++ b/src/core/frontend/applets/web_browser.h
@@ -5,17 +5,29 @@
 #pragma once
 
 #include <functional>
+#include <string_view>
+
+#include "core/hle/service/am/applets/web_types.h"
+
+using namespace Service::AM::Applets;
 
 namespace Core::Frontend {
 
 class WebBrowserApplet {
 public:
     virtual ~WebBrowserApplet();
+
+    virtual void OpenLocalWebPage(
+        std::string_view local_url,
+        std::function<void(WebExitReason, std::string)> callback) const = 0;
 };
 
 class DefaultWebBrowserApplet final : public WebBrowserApplet {
 public:
     ~DefaultWebBrowserApplet() override;
+
+    void OpenLocalWebPage(std::string_view local_url,
+                          std::function<void(WebExitReason, std::string)> callback) const override;
 };
 
 } // namespace Core::Frontend
-- 
cgit v1.2.3


From 8b95bf041da573459e953e27eee2dcf30208b02d Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Mon, 30 Nov 2020 10:15:00 -0500
Subject: main, applets/web: Re-add progress dialog for RomFS extraction

---
 src/core/frontend/applets/web_browser.h | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/core/frontend/applets/web_browser.h')

diff --git a/src/core/frontend/applets/web_browser.h b/src/core/frontend/applets/web_browser.h
index 2ccefc68f..5b0629cfb 100644
--- a/src/core/frontend/applets/web_browser.h
+++ b/src/core/frontend/applets/web_browser.h
@@ -9,8 +9,6 @@
 
 #include "core/hle/service/am/applets/web_types.h"
 
-using namespace Service::AM::Applets;
-
 namespace Core::Frontend {
 
 class WebBrowserApplet {
@@ -18,16 +16,17 @@ public:
     virtual ~WebBrowserApplet();
 
     virtual void OpenLocalWebPage(
-        std::string_view local_url,
-        std::function<void(WebExitReason, std::string)> callback) const = 0;
+        std::string_view local_url, std::function<void()> extract_romfs_callback,
+        std::function<void(Service::AM::Applets::WebExitReason, std::string)> callback) const = 0;
 };
 
 class DefaultWebBrowserApplet final : public WebBrowserApplet {
 public:
     ~DefaultWebBrowserApplet() override;
 
-    void OpenLocalWebPage(std::string_view local_url,
-                          std::function<void(WebExitReason, std::string)> callback) const override;
+    void OpenLocalWebPage(std::string_view local_url, std::function<void()> extract_romfs_callback,
+                          std::function<void(Service::AM::Applets::WebExitReason, std::string)>
+                              callback) const override;
 };
 
 } // namespace Core::Frontend
-- 
cgit v1.2.3


From 82fa9f8d56bc285e7bb58fc81b495a55be9ea82c Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Tue, 8 Dec 2020 06:20:45 -0500
Subject: applets/web: Implement the online web browser applet

---
 src/core/frontend/applets/web_browser.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/core/frontend/applets/web_browser.h')

diff --git a/src/core/frontend/applets/web_browser.h b/src/core/frontend/applets/web_browser.h
index 5b0629cfb..1c5ef19a9 100644
--- a/src/core/frontend/applets/web_browser.h
+++ b/src/core/frontend/applets/web_browser.h
@@ -18,6 +18,10 @@ public:
     virtual void OpenLocalWebPage(
         std::string_view local_url, std::function<void()> extract_romfs_callback,
         std::function<void(Service::AM::Applets::WebExitReason, std::string)> callback) const = 0;
+
+    virtual void OpenExternalWebPage(
+        std::string_view external_url,
+        std::function<void(Service::AM::Applets::WebExitReason, std::string)> callback) const = 0;
 };
 
 class DefaultWebBrowserApplet final : public WebBrowserApplet {
@@ -27,6 +31,10 @@ public:
     void OpenLocalWebPage(std::string_view local_url, std::function<void()> extract_romfs_callback,
                           std::function<void(Service::AM::Applets::WebExitReason, std::string)>
                               callback) const override;
+
+    void OpenExternalWebPage(std::string_view external_url,
+                             std::function<void(Service::AM::Applets::WebExitReason, std::string)>
+                                 callback) const override;
 };
 
 } // namespace Core::Frontend
-- 
cgit v1.2.3