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

Unified Diff: remoting/client/jni/chromoting_jni_instance.h

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/client/jni/android_keymap.h ('k') | remoting/client/jni/chromoting_jni_instance.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/jni/chromoting_jni_instance.h
diff --git a/remoting/client/jni/chromoting_jni_instance.h b/remoting/client/jni/chromoting_jni_instance.h
index de12db5ed88bf8cacebdf30277e4c30a3d449260..da02627d47c79dc22844da473fa5d011314229e9 100644
--- a/remoting/client/jni/chromoting_jni_instance.h
+++ b/remoting/client/jni/chromoting_jni_instance.h
@@ -5,11 +5,11 @@
#ifndef REMOTING_CLIENT_CHROMOTING_JNI_INSTANCE_H_
#define REMOTING_CLIENT_CHROMOTING_JNI_INSTANCE_H_
+#include <memory>
#include <string>
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
#include "remoting/client/chromoting_client.h"
@@ -156,14 +156,14 @@ class ChromotingJniInstance
std::string flags_;
// This group of variables is to be used on the network thread.
- scoped_ptr<ClientContext> client_context_;
- scoped_ptr<protocol::PerformanceTracker> perf_tracker_;
- scoped_ptr<JniFrameConsumer> view_;
- scoped_ptr<protocol::VideoRenderer> video_renderer_;
- scoped_ptr<ChromotingClient> client_;
+ std::unique_ptr<ClientContext> client_context_;
+ std::unique_ptr<protocol::PerformanceTracker> perf_tracker_;
+ std::unique_ptr<JniFrameConsumer> view_;
+ std::unique_ptr<protocol::VideoRenderer> video_renderer_;
+ std::unique_ptr<ChromotingClient> client_;
XmppSignalStrategy::XmppServerConfig xmpp_config_;
- scoped_ptr<XmppSignalStrategy> signaling_; // Must outlive client_
- scoped_ptr<ClientStatusLogger> client_status_logger_;
+ std::unique_ptr<XmppSignalStrategy> signaling_; // Must outlive client_
+ std::unique_ptr<ClientStatusLogger> client_status_logger_;
protocol::ThirdPartyTokenFetchedCallback third_party_token_fetched_callback_;
// Pass this the user's PIN once we have it. To be assigned and accessed on
« no previous file with comments | « remoting/client/jni/android_keymap.h ('k') | remoting/client/jni/chromoting_jni_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698