diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-04-19 09:35:28 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2018-05-25 08:30:14 +0000 |
| commit | 6c319ced199772c89a6c2cee46e551bb36c50360 (patch) | |
| tree | e1bb108178020eb1e7460fa8c533351c40089db1 /src/core/web_contents_adapter.cpp | |
| parent | f012238341216c2355dc724ea8e7de74fa764cc0 (diff) | |
Rename BrowserContextQt to ProfileQt
Following commits are going to introduce
ProfileIODataQt and to keep things self documented
just rename the class so it reflects Chromium one.
Fix minor style issues in profile_qt.h
Presort include headers as requested on review.
Change-Id: If58f5aec8ac64cfaf30642195838a77497b75244
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 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index c7d36cb67..1c5eb2535 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -44,13 +44,13 @@ #include "web_contents_adapter.h" #include "browser_accessibility_qt.h" -#include "browser_context_adapter.h" #include "browser_context_adapter_client.h" -#include "browser_context_qt.h" +#include "browser_context_adapter.h" #include "devtools_frontend_qt.h" #include "download_manager_delegate_qt.h" #include "media_capture_devices_dispatcher.h" #include "printing/print_view_manager_qt.h" +#include "profile_qt.h" #include "qwebenginecallback_p.h" #include "renderer_host/web_channel_ipc_transport_host.h" #include "render_view_observer_host_qt.h" @@ -884,16 +884,16 @@ qreal WebContentsAdapter::currentZoomFactor() const return content::ZoomLevelToZoomFactor(content::HostZoomMap::GetZoomLevel(m_webContents.get())); } -BrowserContextQt* WebContentsAdapter::browserContext() +ProfileQt* WebContentsAdapter::browserContext() { - return m_browserContextAdapter ? m_browserContextAdapter->browserContext() : m_webContents ? static_cast<BrowserContextQt*>(m_webContents->GetBrowserContext()) : 0; + return m_browserContextAdapter ? m_browserContextAdapter->browserContext() : m_webContents ? + static_cast<ProfileQt*>(m_webContents->GetBrowserContext()) : nullptr; } BrowserContextAdapter* WebContentsAdapter::browserContextAdapter() { - return m_browserContextAdapter ? - m_browserContextAdapter : m_webContents ? - static_cast<BrowserContextQt*>(m_webContents->GetBrowserContext())->adapter() : nullptr; + return m_browserContextAdapter ? m_browserContextAdapter : m_webContents ? + static_cast<ProfileQt*>(m_webContents->GetBrowserContext())->adapter() : nullptr; } #ifndef QT_NO_ACCESSIBILITY |