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/content_main_delegate_qt.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/content_main_delegate_qt.h')
-rw-r--r-- | src/core/content_main_delegate_qt.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/content_main_delegate_qt.h b/src/core/content_main_delegate_qt.h index dd7f38f69..3cb3b3bb3 100644 --- a/src/core/content_main_delegate_qt.h +++ b/src/core/content_main_delegate_qt.h @@ -42,7 +42,6 @@ #include "content/public/app/content_main_delegate.h" -#include "base/memory/scoped_ptr.h" #include <QtCore/qcompilerdetection.h> #include "content_browser_client_qt.h" @@ -63,7 +62,7 @@ public: bool BasicStartupComplete(int* /*exit_code*/) Q_DECL_OVERRIDE; private: - scoped_ptr<ContentBrowserClientQt> m_browserClient; + std::unique_ptr<ContentBrowserClientQt> m_browserClient; }; } // namespace QtWebEngineCore |