| Index: components/web_modal/web_contents_modal_dialog_manager.h
|
| diff --git a/components/web_modal/web_contents_modal_dialog_manager.h b/components/web_modal/web_contents_modal_dialog_manager.h
|
| index f5d501116b21bd1005db536c0fc38c893bf5e2ab..6505301c215f73fa3e250b800f239dd3de988208 100644
|
| --- a/components/web_modal/web_contents_modal_dialog_manager.h
|
| +++ b/components/web_modal/web_contents_modal_dialog_manager.h
|
| @@ -6,9 +6,9 @@
|
| #define COMPONENTS_WEB_MODAL_WEB_CONTENTS_MODAL_DIALOG_MANAGER_H_
|
|
|
| #include <deque>
|
| +#include <memory>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "components/web_modal/single_web_contents_dialog_manager.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| #include "content/public/browser/web_contents_user_data.h"
|
| @@ -41,7 +41,7 @@ class WebContentsModalDialogManager
|
| // bubble clients.
|
| void ShowDialogWithManager(
|
| gfx::NativeWindow dialog,
|
| - scoped_ptr<SingleWebContentsDialogManager> manager);
|
| + std::unique_ptr<SingleWebContentsDialogManager> manager);
|
|
|
| // Returns true if any dialogs are active and not closed.
|
| bool IsDialogActive() const;
|
| @@ -77,11 +77,11 @@ class WebContentsModalDialogManager
|
|
|
| struct DialogState {
|
| DialogState(gfx::NativeWindow dialog,
|
| - scoped_ptr<SingleWebContentsDialogManager> manager);
|
| + std::unique_ptr<SingleWebContentsDialogManager> manager);
|
| ~DialogState();
|
|
|
| gfx::NativeWindow dialog;
|
| - scoped_ptr<SingleWebContentsDialogManager> manager;
|
| + std::unique_ptr<SingleWebContentsDialogManager> manager;
|
| };
|
|
|
| typedef std::deque<DialogState*> WebContentsModalDialogList;
|
|
|