diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2019-02-05 14:50:22 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2019-02-05 16:56:24 +0100 |
| commit | 7aa06a1614b7ca6508d96ee2e8ef0f4c49038a6f (patch) | |
| tree | 4331533a6c0fa7a843c831d66e62472a7f8a4d30 /src/core/profile_adapter.cpp | |
| parent | 5e92adf5f85c4ec8340d5b7e92166a5e4f8e9883 (diff) | |
| parent | f17f815878d1d3f02f464347d2807555cab00a88 (diff) | |
Merge remote-tracking branch 'origin/dev' into 5.13
Conflicts:
src/core/content_browser_client_qt.cpp
src/core/content_browser_client_qt.h
Change-Id: I3da791a82dab56fd7535ba1e4c0ab1d9ca74f547
Diffstat (limited to 'src/core/profile_adapter.cpp')
| -rw-r--r-- | src/core/profile_adapter.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/profile_adapter.cpp b/src/core/profile_adapter.cpp index dfe701cc9..48a6906e9 100644 --- a/src/core/profile_adapter.cpp +++ b/src/core/profile_adapter.cpp @@ -58,6 +58,10 @@ #include "components/keyed_service/content/browser_context_dependency_manager.h" +#if BUILDFLAG(ENABLE_EXTENSIONS) +#include "extensions/browser/extension_system.h" +#endif + #include <QCoreApplication> #include <QDir> #include <QString> @@ -93,6 +97,10 @@ ProfileAdapter::ProfileAdapter(const QString &storageName): // fixme: this should not be here m_profile->m_profileIOData->initializeOnUIThread(); m_customUrlSchemeHandlers.insert(QByteArrayLiteral("qrc"), &m_qrcHandler); +#if BUILDFLAG(ENABLE_EXTENSIONS) + if (!storageName.isEmpty()) + extensions::ExtensionSystem::Get(m_profile.data())->InitForRegularProfile(true); +#endif } ProfileAdapter::~ProfileAdapter() |