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

Unified Diff: remoting/host/me2me_desktop_environment.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
« no previous file with comments | « remoting/host/me2me_desktop_environment.h ('k') | remoting/host/mouse_cursor_monitor_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/me2me_desktop_environment.cc
diff --git a/remoting/host/me2me_desktop_environment.cc b/remoting/host/me2me_desktop_environment.cc
index 0a6d37dc804542e994b1036a6779af31b978a49b..35723dbc641e847722b93fa0a463ec821f0f9924 100644
--- a/remoting/host/me2me_desktop_environment.cc
+++ b/remoting/host/me2me_desktop_environment.cc
@@ -7,6 +7,7 @@
#include <utility>
#include "base/logging.h"
+#include "base/memory/ptr_util.h"
#include "base/single_thread_task_runner.h"
#include "build/build_config.h"
#include "remoting/base/logging.h"
@@ -34,10 +35,11 @@ Me2MeDesktopEnvironment::~Me2MeDesktopEnvironment() {
DCHECK(caller_task_runner()->BelongsToCurrentThread());
}
-scoped_ptr<ScreenControls> Me2MeDesktopEnvironment::CreateScreenControls() {
+std::unique_ptr<ScreenControls>
+Me2MeDesktopEnvironment::CreateScreenControls() {
DCHECK(caller_task_runner()->BelongsToCurrentThread());
- return make_scoped_ptr(new ResizingHostObserver(DesktopResizer::Create()));
+ return base::WrapUnique(new ResizingHostObserver(DesktopResizer::Create()));
}
std::string Me2MeDesktopEnvironment::GetCapabilities() const {
@@ -132,11 +134,11 @@ Me2MeDesktopEnvironmentFactory::Me2MeDesktopEnvironmentFactory(
Me2MeDesktopEnvironmentFactory::~Me2MeDesktopEnvironmentFactory() {
}
-scoped_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create(
+std::unique_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create(
base::WeakPtr<ClientSessionControl> client_session_control) {
DCHECK(caller_task_runner()->BelongsToCurrentThread());
- scoped_ptr<Me2MeDesktopEnvironment> desktop_environment(
+ std::unique_ptr<Me2MeDesktopEnvironment> desktop_environment(
new Me2MeDesktopEnvironment(
caller_task_runner(), video_capture_task_runner(),
input_task_runner(), ui_task_runner(), supports_touch_events()));
« no previous file with comments | « remoting/host/me2me_desktop_environment.h ('k') | remoting/host/mouse_cursor_monitor_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698