diff options
author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-12-12 15:06:29 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-03-02 13:18:46 +0000 |
commit | 0c49002d833b6c8ccf822d1ebd29a86b3f15f389 (patch) | |
tree | a414da48ea946a97daba4eb9106f0e2387f18a42 /src/core/web_engine_context.h | |
parent | 26ae2ce0a8401698a2b1c1f0a8162ebf83dcafef (diff) |
Add namespace to internal QtWebEngine API
Adds the QtWebEngineCore namespace to all internal core API. This
ensures we don't export any internal symbols in the global namespace.
Change-Id: I26af888ea7c6c4c4d0f04c24a377c1a9d3c92751
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src/core/web_engine_context.h')
-rw-r--r-- | src/core/web_engine_context.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/core/web_engine_context.h b/src/core/web_engine_context.h index fc9478a97..dbd8f2476 100644 --- a/src/core/web_engine_context.h +++ b/src/core/web_engine_context.h @@ -51,17 +51,19 @@ class BrowserMainRunner; class ContentMainRunner; } +namespace QtWebEngineCore { class BrowserContextAdapter; class ContentMainDelegateQt; class DevToolsHttpHandlerDelegateQt; class SurfaceFactoryQt; +} class WebEngineContext : public base::RefCounted<WebEngineContext> { public: static scoped_refptr<WebEngineContext> current(); - BrowserContextAdapter *defaultBrowserContext(); - BrowserContextAdapter *offTheRecordBrowserContext(); + QtWebEngineCore::BrowserContextAdapter *defaultBrowserContext(); + QtWebEngineCore::BrowserContextAdapter *offTheRecordBrowserContext(); private: friend class base::RefCounted<WebEngineContext>; @@ -69,15 +71,15 @@ private: ~WebEngineContext(); scoped_ptr<base::RunLoop> m_runLoop; - scoped_ptr<ContentMainDelegateQt> m_mainDelegate; + scoped_ptr<QtWebEngineCore::ContentMainDelegateQt> m_mainDelegate; scoped_ptr<content::ContentMainRunner> m_contentRunner; scoped_ptr<content::BrowserMainRunner> m_browserRunner; #if defined(OS_ANDROID) - scoped_ptr<SurfaceFactoryQt> m_surfaceFactory; + scoped_ptr<QtWebEngine::SurfaceFactoryQt> m_surfaceFactory; #endif - QExplicitlySharedDataPointer<BrowserContextAdapter> m_defaultBrowserContext; - QExplicitlySharedDataPointer<BrowserContextAdapter> m_offTheRecordBrowserContext; - scoped_ptr<DevToolsHttpHandlerDelegateQt> m_devtools; + QExplicitlySharedDataPointer<QtWebEngineCore::BrowserContextAdapter> m_defaultBrowserContext; + QExplicitlySharedDataPointer<QtWebEngineCore::BrowserContextAdapter> m_offTheRecordBrowserContext; + scoped_ptr<QtWebEngineCore::DevToolsHttpHandlerDelegateQt> m_devtools; }; #endif // WEB_ENGINE_CONTEXT_H |