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

Unified Diff: remoting/host/it2me/it2me_confirmation_dialog_proxy.cc

Issue 1864213002: Convert //remoting to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac IWYU 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: remoting/host/it2me/it2me_confirmation_dialog_proxy.cc
diff --git a/remoting/host/it2me/it2me_confirmation_dialog_proxy.cc b/remoting/host/it2me/it2me_confirmation_dialog_proxy.cc
index de00e67718ee21aa686a08f36cc9c172b44b6ef1..979e2b7bae06351fadac59ea0914696d04e3e5b6 100644
--- a/remoting/host/it2me/it2me_confirmation_dialog_proxy.cc
+++ b/remoting/host/it2me/it2me_confirmation_dialog_proxy.cc
@@ -19,7 +19,7 @@ class It2MeConfirmationDialogProxy::Core {
Core(scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
base::WeakPtr<It2MeConfirmationDialogProxy> parent,
- scoped_ptr<It2MeConfirmationDialog> dialog);
+ std::unique_ptr<It2MeConfirmationDialog> dialog);
~Core();
// Shows the wrapped dialog. Must be called on the UI thread.
@@ -40,7 +40,7 @@ class It2MeConfirmationDialogProxy::Core {
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_;
base::WeakPtr<It2MeConfirmationDialogProxy> parent_;
- scoped_ptr<It2MeConfirmationDialog> dialog_;
+ std::unique_ptr<It2MeConfirmationDialog> dialog_;
DISALLOW_COPY_AND_ASSIGN(Core);
};
@@ -49,12 +49,11 @@ It2MeConfirmationDialogProxy::Core::Core(
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
base::WeakPtr<It2MeConfirmationDialogProxy> parent,
- scoped_ptr<It2MeConfirmationDialog> dialog)
+ std::unique_ptr<It2MeConfirmationDialog> dialog)
: ui_task_runner_(ui_task_runner),
caller_task_runner_(caller_task_runner),
parent_(parent),
- dialog_(std::move(dialog)) {
-}
+ dialog_(std::move(dialog)) {}
It2MeConfirmationDialogProxy::Core::~Core() {
DCHECK(ui_task_runner_->BelongsToCurrentThread());
@@ -77,7 +76,7 @@ void It2MeConfirmationDialogProxy::Core::ReportResult(
It2MeConfirmationDialogProxy::It2MeConfirmationDialogProxy(
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
- scoped_ptr<It2MeConfirmationDialog> dialog)
+ std::unique_ptr<It2MeConfirmationDialog> dialog)
: weak_factory_(this) {
core_.reset(new Core(ui_task_runner, base::ThreadTaskRunnerHandle::Get(),
weak_factory_.GetWeakPtr(), std::move(dialog)));
« no previous file with comments | « remoting/host/it2me/it2me_confirmation_dialog_proxy.h ('k') | remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698