| Index: ui/views/controls/webview/webview.h
|
| diff --git a/ui/views/controls/webview/webview.h b/ui/views/controls/webview/webview.h
|
| index 9ff7c7f6091ac38865ed7da840fe92bb111d9f3c..cac8ae65c611a3423a54246f16141758686a6728 100644
|
| --- a/ui/views/controls/webview/webview.h
|
| +++ b/ui/views/controls/webview/webview.h
|
| @@ -7,8 +7,9 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "content/public/browser/render_process_host_observer.h"
|
| #include "content/public/browser/web_contents_delegate.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| @@ -98,8 +99,8 @@ class WEBVIEW_EXPORT WebView : public View,
|
| protected:
|
| // Swaps the owned WebContents |wc_owner_| with |new_web_contents|. Returns
|
| // the previously owned WebContents.
|
| - scoped_ptr<content::WebContents> SwapWebContents(
|
| - scoped_ptr<content::WebContents> new_web_contents);
|
| + std::unique_ptr<content::WebContents> SwapWebContents(
|
| + std::unique_ptr<content::WebContents> new_web_contents);
|
|
|
| // Called when the web contents is successfully attached.
|
| virtual void OnWebContentsAttached() {}
|
| @@ -159,7 +160,7 @@ class WEBVIEW_EXPORT WebView : public View,
|
|
|
| NativeViewHost* const holder_;
|
| // Non-NULL if |web_contents()| was created and is owned by this WebView.
|
| - scoped_ptr<content::WebContents> wc_owner_;
|
| + std::unique_ptr<content::WebContents> wc_owner_;
|
| // The RenderProcessHost to which this RenderProcessHostObserver is added.
|
| // Since WebView::GetTextInputClient is relying on RWHV::GetTextInputClient,
|
| // we have to observe the lifecycle of the underlying RWHV through
|
|
|