Index: chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h |
diff --git a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h |
index a43814ab5598fbac3cb55f872795ac66bd7c6132..606d59d866e6dcdd6d12d9b4c8853732533ce482 100644 |
--- a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h |
+++ b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h |
@@ -5,8 +5,9 @@ |
#ifndef CHROME_BROWSER_UI_WEBUI_CONSTRAINED_WEB_DIALOG_DELEGATE_BASE_H_ |
#define CHROME_BROWSER_UI_WEBUI_CONSTRAINED_WEB_DIALOG_DELEGATE_BASE_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" |
#include "ui/web_dialogs/web_dialog_ui.h" |
#include "ui/web_dialogs/web_dialog_web_contents_delegate.h" |
@@ -53,10 +54,10 @@ class ConstrainedWebDialogDelegateBase |
virtual void ResizeToGivenSize(const gfx::Size size); |
private: |
- scoped_ptr<ui::WebDialogDelegate> web_dialog_delegate_; |
+ std::unique_ptr<ui::WebDialogDelegate> web_dialog_delegate_; |
// Holds the HTML to display in the constrained dialog. |
- scoped_ptr<content::WebContents> web_contents_; |
+ std::unique_ptr<content::WebContents> web_contents_; |
// Was the dialog closed from WebUI (in which case |web_dialog_delegate_|'s |
// OnDialogClosed() method has already been called)? |
@@ -65,7 +66,7 @@ class ConstrainedWebDialogDelegateBase |
// If true, release |web_contents_| on close instead of destroying it. |
bool release_contents_on_close_; |
- scoped_ptr<WebDialogWebContentsDelegate> override_tab_delegate_; |
+ std::unique_ptr<WebDialogWebContentsDelegate> override_tab_delegate_; |
DISALLOW_COPY_AND_ASSIGN(ConstrainedWebDialogDelegateBase); |
}; |