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

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

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/host_extension_session_manager.cc ('k') | remoting/host/input_injector_mac.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 the common entry point shared by all Chromoting Host 5 // This file implements the common entry point shared by all Chromoting Host
6 // processes. 6 // processes.
7 7
8 #include "remoting/host/host_main.h" 8 #include "remoting/host/host_main.h"
9 9
10 #include <string> 10 #include <string>
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 return exit_code; 128 return exit_code;
129 } 129 }
130 130
131 return kSuccessExitCode; 131 return kSuccessExitCode;
132 } 132 }
133 133
134 #endif // !defined(OS_WIN) 134 #endif // !defined(OS_WIN)
135 135
136 // Select the entry point corresponding to the process type. 136 // Select the entry point corresponding to the process type.
137 MainRoutineFn SelectMainRoutine(const std::string& process_type) { 137 MainRoutineFn SelectMainRoutine(const std::string& process_type) {
138 MainRoutineFn main_routine = NULL; 138 MainRoutineFn main_routine = nullptr;
139 139
140 if (process_type == kProcessTypeHost) { 140 if (process_type == kProcessTypeHost) {
141 main_routine = &HostProcessMain; 141 main_routine = &HostProcessMain;
142 #if defined(OS_WIN) 142 #if defined(OS_WIN)
143 } else if (process_type == kProcessTypeDaemon) { 143 } else if (process_type == kProcessTypeDaemon) {
144 main_routine = &DaemonProcessMain; 144 main_routine = &DaemonProcessMain;
145 } else if (process_type == kProcessTypeDesktop) { 145 } else if (process_type == kProcessTypeDesktop) {
146 main_routine = &DesktopProcessMain; 146 main_routine = &DesktopProcessMain;
147 } else if (process_type == kProcessTypeController) { 147 } else if (process_type == kProcessTypeController) {
148 main_routine = &ElevatedControllerMain; 148 main_routine = &ElevatedControllerMain;
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 return exit_code; 238 return exit_code;
239 } 239 }
240 240
241 } // namespace remoting 241 } // namespace remoting
242 242
243 #if !defined(OS_WIN) 243 #if !defined(OS_WIN)
244 int main(int argc, char** argv) { 244 int main(int argc, char** argv) {
245 return remoting::HostMain(argc, argv); 245 return remoting::HostMain(argc, argv);
246 } 246 }
247 #endif // !defined(OS_WIN) 247 #endif // !defined(OS_WIN)
OLDNEW
« no previous file with comments | « remoting/host/host_extension_session_manager.cc ('k') | remoting/host/input_injector_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698