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

Side by Side Diff: remoting/host/setup/daemon_controller_win.cc

Issue 16943003: Rewrite scoped_ptr<T>(NULL) to use the default ctor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « net/http/http_auth_handler_ntlm_win.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "remoting/host/setup/daemon_controller.h" 5 #include "remoting/host/setup/daemon_controller.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 } else { 432 } else {
433 // TODO(sergeyu): Report other errors to the webapp once it knows 433 // TODO(sergeyu): Report other errors to the webapp once it knows
434 // how to handle them. 434 // how to handle them.
435 return RESULT_FAILED; 435 return RESULT_FAILED;
436 } 436 }
437 } 437 }
438 438
439 void DaemonControllerWin::DoGetConfig(const GetConfigCallback& callback) { 439 void DaemonControllerWin::DoGetConfig(const GetConfigCallback& callback) {
440 DCHECK(worker_thread_.message_loop_proxy()->BelongsToCurrentThread()); 440 DCHECK(worker_thread_.message_loop_proxy()->BelongsToCurrentThread());
441 441
442 scoped_ptr<base::DictionaryValue> dictionary_null(NULL); 442 scoped_ptr<base::DictionaryValue> dictionary_null;
443 443
444 // Configure and start the Daemon Controller if it is installed already. 444 // Configure and start the Daemon Controller if it is installed already.
445 HRESULT hr = ActivateController(); 445 HRESULT hr = ActivateController();
446 if (FAILED(hr)) { 446 if (FAILED(hr)) {
447 callback.Run(dictionary_null.Pass()); 447 callback.Run(dictionary_null.Pass());
448 return; 448 return;
449 } 449 }
450 450
451 // Get the host configuration. 451 // Get the host configuration.
452 ScopedBstr host_config; 452 ScopedBstr host_config;
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 done.Run(true, !!allowed, !!set_by_policy); 659 done.Run(true, !!allowed, !!set_by_policy);
660 } 660 }
661 661
662 } // namespace 662 } // namespace
663 663
664 scoped_ptr<DaemonController> remoting::DaemonController::Create() { 664 scoped_ptr<DaemonController> remoting::DaemonController::Create() {
665 return scoped_ptr<DaemonController>(new DaemonControllerWin()); 665 return scoped_ptr<DaemonController>(new DaemonControllerWin());
666 } 666 }
667 667
668 } // namespace remoting 668 } // namespace remoting
OLDNEW
« no previous file with comments | « net/http/http_auth_handler_ntlm_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698