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

Unified Diff: extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h

Issue 1909773002: Convert //extensions/browser 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: extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
index 4618d9f86fa9dd1f9cc68fee1553f90f3ca8d66e..ef91c244b33bf08eccfb87ecb89e03b41e43dcad 100644
--- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
@@ -22,7 +22,7 @@ class MimeHandlerViewGuestDelegate;
// MimeHandler to handle a resource stream.
class StreamContainer {
public:
- StreamContainer(scoped_ptr<content::StreamInfo> stream,
+ StreamContainer(std::unique_ptr<content::StreamInfo> stream,
int tab_id,
bool embedded,
const GURL& handler_url,
@@ -41,7 +41,7 @@ class StreamContainer {
std::string extension_id() const { return extension_id_; }
private:
- const scoped_ptr<content::StreamInfo> stream_;
+ const std::unique_ptr<content::StreamInfo> stream_;
const bool embedded_;
const int tab_id_;
const GURL handler_url_;
@@ -94,8 +94,8 @@ class MimeHandlerViewGuest :
std::string view_id() const { return view_id_; }
base::WeakPtr<StreamContainer> GetStream() const;
- scoped_ptr<MimeHandlerViewGuestDelegate> delegate_;
- scoped_ptr<StreamContainer> stream_;
+ std::unique_ptr<MimeHandlerViewGuestDelegate> delegate_;
+ std::unique_ptr<StreamContainer> stream_;
std::string view_id_;
DISALLOW_COPY_AND_ASSIGN(MimeHandlerViewGuest);

Powered by Google App Engine
This is Rietveld 408576698