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_contents_adapter_p.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_contents_adapter_p.h')
| -rw-r--r-- | src/core/web_contents_adapter_p.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/web_contents_adapter_p.h b/src/core/web_contents_adapter_p.h index 5c0e83298..77522d299 100644 --- a/src/core/web_contents_adapter_p.h +++ b/src/core/web_contents_adapter_p.h @@ -55,7 +55,6 @@ #include <base/callback.h> #include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" #include <QScopedPointer> #include <QSharedPointer> @@ -84,10 +83,10 @@ public: ~WebContentsAdapterPrivate(); scoped_refptr<WebEngineContext> engineContext; QSharedPointer<BrowserContextAdapter> browserContextAdapter; - scoped_ptr<content::WebContents> webContents; - scoped_ptr<WebContentsDelegateQt> webContentsDelegate; - scoped_ptr<RenderViewObserverHostQt> renderViewObserverHost; - scoped_ptr<WebChannelIPCTransportHost> webChannelTransport; + std::unique_ptr<content::WebContents> webContents; + std::unique_ptr<WebContentsDelegateQt> webContentsDelegate; + std::unique_ptr<RenderViewObserverHostQt> renderViewObserverHost; + std::unique_ptr<WebChannelIPCTransportHost> webChannelTransport; QWebChannel *webChannel; unsigned int webChannelWorld; WebContentsAdapterClient *adapterClient; |