diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-15 13:16:24 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-09-14 08:15:28 +0000 |
| commit | baaab31631dcff6075418c95f0220e8fb207dd50 (patch) | |
| tree | eea3e8e723f0b142965d7c13ce23d061e73d3cc8 /src/core/web_engine_context.h | |
| parent | e462c0919113b7aae0a24fc438bce648c9fbcfc2 (diff) | |
Adaptations to Chromium 52
Change-Id: Idf8a511ba26d263fd9d014d87d5e1101d706da71
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/web_engine_context.h')
| -rw-r--r-- | src/core/web_engine_context.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/core/web_engine_context.h b/src/core/web_engine_context.h index 3b14f6e00..878b651de 100644 --- a/src/core/web_engine_context.h +++ b/src/core/web_engine_context.h @@ -43,7 +43,6 @@ #include "qtwebenginecoreglobal.h" #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include "base/values.h" #include <QSharedPointer> @@ -92,15 +91,15 @@ private: WebEngineContext(); ~WebEngineContext(); - scoped_ptr<base::RunLoop> m_runLoop; - scoped_ptr<ContentMainDelegateQt> m_mainDelegate; - scoped_ptr<content::ContentMainRunner> m_contentRunner; - scoped_ptr<content::BrowserMainRunner> m_browserRunner; + std::unique_ptr<base::RunLoop> m_runLoop; + std::unique_ptr<ContentMainDelegateQt> m_mainDelegate; + std::unique_ptr<content::ContentMainRunner> m_contentRunner; + std::unique_ptr<content::BrowserMainRunner> m_browserRunner; QObject* m_globalQObject; QSharedPointer<QtWebEngineCore::BrowserContextAdapter> m_defaultBrowserContext; - scoped_ptr<devtools_http_handler::DevToolsHttpHandler> m_devtools; + std::unique_ptr<devtools_http_handler::DevToolsHttpHandler> m_devtools; #if defined(ENABLE_BASIC_PRINTING) - scoped_ptr<printing::PrintJobManager> m_printJobManager; + std::unique_ptr<printing::PrintJobManager> m_printJobManager; #endif // defined(ENABLE_BASIC_PRINTING) }; |