diff options
author | Michal Klocek <michal.klocek@qt.io> | 2018-06-15 11:19:32 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2018-07-06 13:53:03 +0000 |
commit | a83fd13f62673ce439bdfea55238f9d8ef8676ce (patch) | |
tree | c0d776725235ca6c2d51b709d186db89618b7d86 /src/core/web_contents_adapter.cpp | |
parent | 153b0d9acf3531d28d790fc98dbaf9ad24a3fae5 (diff) |
Finalize change from BrowserContext to Profile
Changes 6c319ce and af313cb splited BrowserContextQt
into ProfileQt and ProfileIODataQt. Finalize the
change and rename leftover browserContext references
to follow the initial change.
Change-Id: I845142b1edb67ec4b94439be1e6cfc841dd3f55c
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/core/web_contents_adapter.cpp')
-rw-r--r-- | src/core/web_contents_adapter.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index ab96ae10e..e239e853a 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -358,13 +358,13 @@ QSharedPointer<WebContentsAdapter> WebContentsAdapter::createFromSerializedNavig { int currentIndex; std::vector<std::unique_ptr<content::NavigationEntry>> entries; - deserializeNavigationHistory(input, ¤tIndex, &entries, adapterClient->browserContextAdapter()->browserContext()); + deserializeNavigationHistory(input, ¤tIndex, &entries, adapterClient->browserContextAdapter()->profile()); if (currentIndex == -1) return QSharedPointer<WebContentsAdapter>(); // Unlike WebCore, Chromium only supports Restoring to a new WebContents instance. - content::WebContents* newWebContents = createBlankWebContents(adapterClient, adapterClient->browserContextAdapter()->browserContext()); + content::WebContents* newWebContents = createBlankWebContents(adapterClient, adapterClient->browserContextAdapter()->profile()); content::NavigationController &controller = newWebContents->GetController(); controller.Restore(currentIndex, content::RestoreType::LAST_SESSION_EXITED_CLEANLY, &entries); @@ -427,7 +427,7 @@ void WebContentsAdapter::initialize(content::SiteInstance *site) // Create our own if a WebContents wasn't provided at construction. if (!m_webContents) { - content::WebContents::CreateParams create_params(m_browserContextAdapter->browserContext(), site); + content::WebContents::CreateParams create_params(m_browserContextAdapter->profile(), site); create_params.initial_size = gfx::Size(kTestWindowWidth, kTestWindowHeight); create_params.context = reinterpret_cast<gfx::NativeView>(m_adapterClient); m_webContents.reset(content::WebContents::Create(create_params)); @@ -555,7 +555,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request) GURL gurl = toGurl(request.url()); if (!isInitialized()) { scoped_refptr<content::SiteInstance> site = - content::SiteInstance::CreateForURL(m_browserContextAdapter->browserContext(), gurl); + content::SiteInstance::CreateForURL(m_browserContextAdapter->profile(), gurl); initialize(site.get()); } @@ -885,9 +885,9 @@ qreal WebContentsAdapter::currentZoomFactor() const return content::ZoomLevelToZoomFactor(content::HostZoomMap::GetZoomLevel(m_webContents.get())); } -ProfileQt* WebContentsAdapter::browserContext() +ProfileQt* WebContentsAdapter::profile() { - return m_browserContextAdapter ? m_browserContextAdapter->browserContext() : m_webContents ? + return m_browserContextAdapter ? m_browserContextAdapter->profile() : m_webContents ? static_cast<ProfileQt*>(m_webContents->GetBrowserContext()) : nullptr; } |