Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(658)

Unified Diff: components/web_modal/web_contents_modal_dialog_manager.h

Issue 1917673002: Convert //components/[u-z]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;

Powered by Google App Engine
This is Rietveld 408576698