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

Unified Diff: chrome/browser/ui/views/desktop_media_picker_views.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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/ui/views/desktop_media_picker_views.h
diff --git a/chrome/browser/ui/views/desktop_media_picker_views.h b/chrome/browser/ui/views/desktop_media_picker_views.h
index 3e34228f1520ae016eb1f9b571f1371051390c86..992a46c470a21216c027bcd726af2555889b7a2b 100644
--- a/chrome/browser/ui/views/desktop_media_picker_views.h
+++ b/chrome/browser/ui/views/desktop_media_picker_views.h
@@ -26,7 +26,7 @@ class DesktopMediaListView : public views::View,
public DesktopMediaListObserver {
public:
DesktopMediaListView(DesktopMediaPickerDialogView* parent,
- scoped_ptr<DesktopMediaList> media_list);
+ std::unique_ptr<DesktopMediaList> media_list);
~DesktopMediaListView() override;
void StartUpdating(content::DesktopMediaID dialog_window_id);
@@ -59,7 +59,7 @@ class DesktopMediaListView : public views::View,
void AcceptSelection();
DesktopMediaPickerDialogView* parent_;
- scoped_ptr<DesktopMediaList> media_list_;
+ std::unique_ptr<DesktopMediaList> media_list_;
base::WeakPtrFactory<DesktopMediaListView> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(DesktopMediaListView);
@@ -119,7 +119,7 @@ class DesktopMediaPickerDialogView : public views::DialogDelegateView {
DesktopMediaPickerViews* parent,
const base::string16& app_name,
const base::string16& target_name,
- scoped_ptr<DesktopMediaList> media_list,
+ std::unique_ptr<DesktopMediaList> media_list,
bool request_audio);
~DesktopMediaPickerDialogView() override;
@@ -173,7 +173,7 @@ class DesktopMediaPickerViews : public DesktopMediaPicker {
gfx::NativeWindow parent,
const base::string16& app_name,
const base::string16& target_name,
- scoped_ptr<DesktopMediaList> media_list,
+ std::unique_ptr<DesktopMediaList> media_list,
bool request_audio,
const DoneCallback& done_callback) override;

Powered by Google App Engine
This is Rietveld 408576698