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

Side by Side Diff: remoting/host/setup/daemon_controller.h

Issue 810133003: replace NULL->nullptr in src/remoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « remoting/host/sas_injector_win.cc ('k') | remoting/host/setup/daemon_controller.cc » ('j') | 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 #ifndef REMOTING_HOST_SETUP_DAEMON_CONTROLLER_H_ 5 #ifndef REMOTING_HOST_SETUP_DAEMON_CONTROLLER_H_
6 #define REMOTING_HOST_SETUP_DAEMON_CONTROLLER_H_ 6 #define REMOTING_HOST_SETUP_DAEMON_CONTROLLER_H_
7 7
8 #include <queue> 8 #include <queue>
9 #include <string> 9 #include <string>
10 10
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 // Failed to access host directory. 67 // Failed to access host directory.
68 RESULT_FAILED_DIRECTORY = 3 68 RESULT_FAILED_DIRECTORY = 3
69 69
70 // TODO(sergeyu): Add more error codes when we know how to handle 70 // TODO(sergeyu): Add more error codes when we know how to handle
71 // them in the webapp. 71 // them in the webapp.
72 }; 72 };
73 73
74 // Callback type for GetConfig(). If the host is configured then a dictionary 74 // Callback type for GetConfig(). If the host is configured then a dictionary
75 // is returned containing host_id and xmpp_login, with security-sensitive 75 // is returned containing host_id and xmpp_login, with security-sensitive
76 // fields filtered out. An empty dictionary is returned if the host is not 76 // fields filtered out. An empty dictionary is returned if the host is not
77 // configured, and NULL if the configuration is corrupt or cannot be read. 77 // configured, and nullptr if the configuration is corrupt or cannot be read.
78 typedef base::Callback<void (scoped_ptr<base::DictionaryValue> config)> 78 typedef base::Callback<void (scoped_ptr<base::DictionaryValue> config)>
79 GetConfigCallback; 79 GetConfigCallback;
80 80
81 // Callback used for asynchronous operations, e.g. when 81 // Callback used for asynchronous operations, e.g. when
82 // starting/stopping the service. 82 // starting/stopping the service.
83 typedef base::Callback<void (AsyncResult result)> CompletionCallback; 83 typedef base::Callback<void (AsyncResult result)> CompletionCallback;
84 84
85 // Callback type for GetVersion(). 85 // Callback type for GetVersion().
86 typedef base::Callback<void (const std::string&)> GetVersionCallback; 86 typedef base::Callback<void (const std::string&)> GetVersionCallback;
87 87
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 scoped_ptr<Delegate> delegate_; 268 scoped_ptr<Delegate> delegate_;
269 269
270 std::queue<base::Closure> pending_requests_; 270 std::queue<base::Closure> pending_requests_;
271 271
272 DISALLOW_COPY_AND_ASSIGN(DaemonController); 272 DISALLOW_COPY_AND_ASSIGN(DaemonController);
273 }; 273 };
274 274
275 } // namespace remoting 275 } // namespace remoting
276 276
277 #endif // REMOTING_HOST_SETUP_DAEMON_CONTROLLER_H_ 277 #endif // REMOTING_HOST_SETUP_DAEMON_CONTROLLER_H_
OLDNEW
« no previous file with comments | « remoting/host/sas_injector_win.cc ('k') | remoting/host/setup/daemon_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698