| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| index da1c2b50f824061fe8431b3c1b5a96837cdfd4df..6717183471a88b93fe71fb74ac84a1752cdfcd7b 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -116,6 +116,7 @@
|
| #include "content/public/common/main_function_params.h"
|
| #include "media/audio/sounds/sounds_manager.h"
|
| #include "net/base/network_change_notifier.h"
|
| +#include "net/socket/ssl_server_socket.h"
|
| #include "net/url_request/url_request.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
| #include "ui/base/touch/touch_device.h"
|
| @@ -298,6 +299,10 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
|
|
|
| dbus_services_.reset(new internal::DBusServices(parameters()));
|
|
|
| + // Enable support for SSL server sockets, which must be done while still
|
| + // single-threaded. This is required for remote assistance host on Chrome OS.
|
| + net::EnableSSLServerSockets();
|
| +
|
| ChromeBrowserMainPartsLinux::PostMainMessageLoopStart();
|
| }
|
|
|
|
|