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

Side by Side Diff: remoting/host/it2me/it2me_native_messaging_host_main.cc

Issue 2405403002: Remove net::EnableSSLServerSockets. (Closed)
Patch Set: Created 4 years, 2 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/base/run_all_unittests.cc ('k') | remoting/host/remoting_me2me_host.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 #include "remoting/host/it2me/it2me_native_messaging_host_main.h" 5 #include "remoting/host/it2me/it2me_native_messaging_host_main.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/at_exit.h" 9 #include "base/at_exit.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/i18n/icu_util.h" 11 #include "base/i18n/icu_util.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/run_loop.h" 13 #include "base/run_loop.h"
14 #include "build/build_config.h" 14 #include "build/build_config.h"
15 #include "net/socket/ssl_server_socket.h"
16 #include "remoting/base/auto_thread_task_runner.h" 15 #include "remoting/base/auto_thread_task_runner.h"
17 #include "remoting/base/breakpad.h" 16 #include "remoting/base/breakpad.h"
18 #include "remoting/host/chromoting_host_context.h" 17 #include "remoting/host/chromoting_host_context.h"
19 #include "remoting/host/host_exit_codes.h" 18 #include "remoting/host/host_exit_codes.h"
20 #include "remoting/host/it2me/it2me_native_messaging_host.h" 19 #include "remoting/host/it2me/it2me_native_messaging_host.h"
21 #include "remoting/host/logging.h" 20 #include "remoting/host/logging.h"
22 #include "remoting/host/native_messaging/native_messaging_pipe.h" 21 #include "remoting/host/native_messaging/native_messaging_pipe.h"
23 #include "remoting/host/native_messaging/pipe_messaging_channel.h" 22 #include "remoting/host/native_messaging/pipe_messaging_channel.h"
24 #include "remoting/host/resources.h" 23 #include "remoting/host/resources.h"
25 #include "remoting/host/usage_stats_consent.h" 24 #include "remoting/host/usage_stats_consent.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 // Required for any calls into GTK functions, such as the Disconnect and 81 // Required for any calls into GTK functions, such as the Disconnect and
83 // Continue windows. Calling with nullptr arguments because we don't have 82 // Continue windows. Calling with nullptr arguments because we don't have
84 // any command line arguments for gtk to consume. 83 // any command line arguments for gtk to consume.
85 gtk_init(nullptr, nullptr); 84 gtk_init(nullptr, nullptr);
86 85
87 // Need to prime the host OS version value for linux to prevent IO on the 86 // Need to prime the host OS version value for linux to prevent IO on the
88 // network thread. base::GetLinuxDistro() caches the result. 87 // network thread. base::GetLinuxDistro() caches the result.
89 base::GetLinuxDistro(); 88 base::GetLinuxDistro();
90 #endif // OS_LINUX 89 #endif // OS_LINUX
91 90
92 // Enable support for SSL server sockets, which must be done while still
93 // single-threaded.
94 net::EnableSSLServerSockets();
95
96 base::File read_file; 91 base::File read_file;
97 base::File write_file; 92 base::File write_file;
98 bool needs_elevation = false; 93 bool needs_elevation = false;
99 94
100 #if defined(OS_WIN) 95 #if defined(OS_WIN)
101 96
102 const base::CommandLine* command_line = 97 const base::CommandLine* command_line =
103 base::CommandLine::ForCurrentProcess(); 98 base::CommandLine::ForCurrentProcess();
104 99
105 if (command_line->HasSwitch(kElevateSwitchName)) { 100 if (command_line->HasSwitch(kElevateSwitchName)) {
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 // This object instance is required by Chrome code (such as MessageLoop). 196 // This object instance is required by Chrome code (such as MessageLoop).
202 base::AtExitManager exit_manager; 197 base::AtExitManager exit_manager;
203 198
204 base::CommandLine::Init(argc, argv); 199 base::CommandLine::Init(argc, argv);
205 remoting::InitHostLogging(); 200 remoting::InitHostLogging();
206 201
207 return StartIt2MeNativeMessagingHost(); 202 return StartIt2MeNativeMessagingHost();
208 } 203 }
209 204
210 } // namespace remoting 205 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/base/run_all_unittests.cc ('k') | remoting/host/remoting_me2me_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698