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

Side by Side Diff: remoting/host/remoting_me2me_host.cc

Issue 1917053003: unique_ptr_migration: clean up references to scoped_ptr as of r389721 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 // This file implements a standalone host process for Me2Me. 5 // This file implements a standalone host process for Me2Me.
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 // the location of the code that detected the fatal error resulted in this 326 // the location of the code that detected the fatal error resulted in this
327 // request. 327 // request.
328 void OnCrash(const std::string& function_name, 328 void OnCrash(const std::string& function_name,
329 const std::string& file_name, 329 const std::string& file_name,
330 const int& line_number); 330 const int& line_number);
331 331
332 std::unique_ptr<ChromotingHostContext> context_; 332 std::unique_ptr<ChromotingHostContext> context_;
333 333
334 #if defined(OS_LINUX) 334 #if defined(OS_LINUX)
335 // Watch for certificate changes and kill the host when changes occur 335 // Watch for certificate changes and kill the host when changes occur
336 scoped_ptr<CertificateWatcher> cert_watcher_; 336 std::unique_ptr<CertificateWatcher> cert_watcher_;
337 #endif 337 #endif
338 338
339 // XMPP server/remoting bot configuration (initialized from the command line). 339 // XMPP server/remoting bot configuration (initialized from the command line).
340 XmppSignalStrategy::XmppServerConfig xmpp_server_config_; 340 XmppSignalStrategy::XmppServerConfig xmpp_server_config_;
341 std::string directory_bot_jid_; 341 std::string directory_bot_jid_;
342 342
343 // Created on the UI thread but used from the network thread. 343 // Created on the UI thread but used from the network thread.
344 base::FilePath host_config_path_; 344 base::FilePath host_config_path_;
345 std::string host_config_; 345 std::string host_config_;
346 std::unique_ptr<DesktopEnvironmentFactory> desktop_environment_factory_; 346 std::unique_ptr<DesktopEnvironmentFactory> desktop_environment_factory_;
(...skipping 1303 matching lines...) Expand 10 before | Expand all | Expand 10 after
1650 base::TimeDelta::FromSeconds(kShutdownTimeoutSeconds)); 1650 base::TimeDelta::FromSeconds(kShutdownTimeoutSeconds));
1651 new HostProcess(std::move(context), &exit_code, &shutdown_watchdog); 1651 new HostProcess(std::move(context), &exit_code, &shutdown_watchdog);
1652 1652
1653 // Run the main (also UI) message loop until the host no longer needs it. 1653 // Run the main (also UI) message loop until the host no longer needs it.
1654 message_loop.Run(); 1654 message_loop.Run();
1655 1655
1656 return exit_code; 1656 return exit_code;
1657 } 1657 }
1658 1658
1659 } // namespace remoting 1659 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/linux/certificate_watcher_unittest.cc ('k') | sandbox/win/src/address_sanitizer_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698