summaryrefslogtreecommitdiffstats
path: root/src/core/web_engine_context.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2014-09-02 15:03:16 +0200
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2014-11-06 16:39:00 +0100
commitfca9015175950b04bafb9b3af7d4e693eb0243d9 (patch)
tree3eaad9f6eb131d901da6aa32df15b984baff731c /src/core/web_engine_context.cpp
parenta5a680f93ddd2488c8eb494a17ff18a0932e8cec (diff)
Unglobalize browserContext
This patch makes it possible to have more than one BrowserContext, for instance for off-the-record browsering but also to enable any other configuration on browser context level. This will make it possible to add page-groups settings and API for settingsthat can only be done on BrowserContext level. This patch does not expose any new API. Change-Id: I0a0e194449cfb5a096a4ac6e2f2b3882b6b4cfa2 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/core/web_engine_context.cpp')
-rw-r--r--src/core/web_engine_context.cpp18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 13daef5f6..c2e2da740 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -65,6 +65,7 @@
#include "content/public/app/startup_helper_win.h"
#endif // OS_WIN
+#include "browser_context_adapter.h"
#include "content_browser_client_qt.h"
#include "content_client_qt.h"
#include "content_main_delegate_qt.h"
@@ -73,7 +74,6 @@
#include "type_conversion.h"
#include "surface_factory_qt.h"
#include "web_engine_library_info.h"
-#include "web_engine_visited_links_manager.h"
#include <QGuiApplication>
#include <QOpenGLContext>
#include <QStringList>
@@ -107,9 +107,18 @@ scoped_refptr<WebEngineContext> WebEngineContext::current()
return sContext;
}
-WebEngineVisitedLinksManager *WebEngineContext::visitedLinksManager()
+BrowserContextAdapter* WebEngineContext::defaultBrowserContext()
{
- return m_visitedLinksManager.get();
+ if (!m_defaultBrowserContext)
+ m_defaultBrowserContext.reset(new BrowserContextAdapter());
+ return m_defaultBrowserContext.get();
+}
+
+BrowserContextAdapter* WebEngineContext::offTheRecordBrowserContext()
+{
+ if (!m_offTheRecordBrowserContext)
+ m_offTheRecordBrowserContext.reset(new BrowserContextAdapter(true));
+ return m_offTheRecordBrowserContext.get();
}
#ifndef CHROMIUM_VERSION
@@ -203,7 +212,4 @@ WebEngineContext::WebEngineContext()
// thread to avoid a thread check assertion in its constructor when it
// first gets referenced on the IO thread.
MediaCaptureDevicesDispatcher::GetInstance();
-
- // Ensure we have a VisitedLinksMaster instance up and running
- m_visitedLinksManager.reset(new WebEngineVisitedLinksManager);
}