Merge remote-tracking branch 'origin/5.15' into dev

Including update to 87-based

Change-Id: I36b6054e00de97ab055d0bc800cff08d0408fac6

1 files changed, 9 insertions, 2 deletions

diff --git a/src/core/extensions/extensions_api_client_qt.cpp b/src/core/extensions/extensions_api_client_qt.cpp
index 731b79a63..81d9efde2 100644
--- a/src/core/extensions/extensions_api_client_qt.cpp
+++ b/src/core/extensions/extensions_api_client_qt.cpp
@@ -43,13 +43,13 @@
 // found in the LICENSE file.
 
 #include "extensions_api_client_qt.h"
+#include "messaging_delegate_qt.h"
 
 #include <memory>
-//#include "base/memory/ptr_util.h"
-#include "extension_web_contents_observer_qt.h"
 #include "components/pdf/browser/pdf_web_contents_helper.h"
 #include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h"
 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h"
+#include "extension_web_contents_observer_qt.h"
 #include "printing/print_view_manager_qt.h"
 
 namespace extensions {
@@ -82,4 +82,11 @@ void ExtensionsAPIClientQt::AttachWebContentsHelpers(content::WebContents *web_c
     ExtensionWebContentsObserverQt::CreateForWebContents(web_contents);
 }
 
+MessagingDelegate *ExtensionsAPIClientQt::GetMessagingDelegate()
+{
+    if (!m_messagingDelegate)
+        m_messagingDelegate = std::make_unique<MessagingDelegateQt>();
+    return m_messagingDelegate.get();
+}
+
 } // namespace extensions