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

Unified Diff: chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header 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: chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h
index 3295faf7908dc7071815e81b7bac16096a3671c4..57286fa6f6759dd9b432accdb718f9d89d2abed2 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h
@@ -26,11 +26,12 @@ class DesktopCaptureChooseDesktopMediaFunctionBase
// Used for tests to supply fake picker.
class PickerFactory {
public:
- virtual scoped_ptr<DesktopMediaList> CreateModel(bool show_screens,
- bool show_windows,
- bool show_tabs,
- bool show_audio) = 0;
- virtual scoped_ptr<DesktopMediaPicker> CreatePicker() = 0;
+ virtual std::unique_ptr<DesktopMediaList> CreateModel(bool show_screens,
+ bool show_windows,
+ bool show_tabs,
+ bool show_audio) = 0;
+ virtual std::unique_ptr<DesktopMediaPicker> CreatePicker() = 0;
+
protected:
virtual ~PickerFactory() {}
};
@@ -69,7 +70,7 @@ class DesktopCaptureChooseDesktopMediaFunctionBase
// URL of page that desktop capture was requested for.
GURL origin_;
- scoped_ptr<DesktopMediaPicker> picker_;
+ std::unique_ptr<DesktopMediaPicker> picker_;
};
class DesktopCaptureCancelChooseDesktopMediaFunctionBase

Powered by Google App Engine
This is Rietveld 408576698