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

Unified Diff: remoting/client/plugin/chromoting_instance.cc

Issue 609923004: Cleanup usage of scoped_ptr<> in remoting for C++11 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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/client/plugin/chromoting_instance.cc
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index 4b1e996acb6b49d6f35051a1c67e943c62f8ccfd..e28d5c4e4c8c10d9587fb65f245bbd7f708997e6 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -629,7 +629,7 @@ void ChromotingInstance::SetCursorShape(
dictionary.Set(pp::Var("hotspotY"), cursor_hotspot.y());
dictionary.Set(pp::Var("data"), array_buffer);
PostChromotingMessage("setCursorShape", dictionary);
- input_handler_.SetMouseCursor(scoped_ptr<pp::ImageData>(), cursor_hotspot);
+ input_handler_.SetMouseCursor(nullptr, cursor_hotspot);
} else {
if (delegate_large_cursors_) {
pp::VarDictionary dictionary;
@@ -759,8 +759,7 @@ void ChromotingInstance::HandleConnect(const base::DictionaryValue& data) {
scoped_ptr<protocol::TransportFactory> transport_factory(
new protocol::LibjingleTransportFactory(
signal_strategy_.get(),
- PepperPortAllocator::Create(this)
- .PassAs<cricket::HttpPortAllocatorBase>(),
+ PepperPortAllocator::Create(this).Pass(),
protocol::NetworkSettings(
protocol::NetworkSettings::NAT_TRAVERSAL_FULL)));

Powered by Google App Engine
This is Rietveld 408576698