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

Unified Diff: components/infobars/core/infobar_manager.h

Issue 1918083002: Convert //components/[f-n]* 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
« no previous file with comments | « components/infobars/core/infobar.cc ('k') | components/infobars/core/infobar_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/infobars/core/infobar_manager.h
diff --git a/components/infobars/core/infobar_manager.h b/components/infobars/core/infobar_manager.h
index 502edac68a9b7ba6795df303ee4bd9cf558d3cde..72f7a743206b7673d7678db0dbbcd327189b588c 100644
--- a/components/infobars/core/infobar_manager.h
+++ b/components/infobars/core/infobar_manager.h
@@ -7,10 +7,10 @@
#include <stddef.h>
+#include <memory>
#include <vector>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "components/infobars/core/infobar_delegate.h"
@@ -57,7 +57,7 @@ class InfoBarManager {
// immediately without being added.
//
// Returns the infobar if it was successfully added.
- InfoBar* AddInfoBar(scoped_ptr<InfoBar> infobar);
+ InfoBar* AddInfoBar(std::unique_ptr<InfoBar> infobar);
// Removes the specified |infobar|. This in turn may close immediately or
// animate closed; at the end the infobar will delete itself.
@@ -80,7 +80,7 @@ class InfoBarManager {
//
// NOTE: This does not perform any EqualsDelegate() checks like AddInfoBar().
InfoBar* ReplaceInfoBar(InfoBar* old_infobar,
- scoped_ptr<InfoBar> new_infobar);
+ std::unique_ptr<InfoBar> new_infobar);
// Returns the number of infobars for this tab.
size_t infobar_count() const { return infobars_.size(); }
@@ -101,8 +101,8 @@ class InfoBarManager {
virtual int GetActiveEntryID() = 0;
// Returns a confirm infobar that owns |delegate|.
- virtual scoped_ptr<infobars::InfoBar> CreateConfirmInfoBar(
- scoped_ptr<ConfirmInfoBarDelegate> delegate) = 0;
+ virtual std::unique_ptr<infobars::InfoBar> CreateConfirmInfoBar(
+ std::unique_ptr<ConfirmInfoBarDelegate> delegate) = 0;
// Opens a URL according to the specified |disposition|.
virtual void OpenURL(const GURL& url, WindowOpenDisposition disposition) = 0;
« no previous file with comments | « components/infobars/core/infobar.cc ('k') | components/infobars/core/infobar_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698