diff options
author | caseq@chromium.org <caseq@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-31 11:34:23 +0000 |
---|---|---|
committer | caseq@chromium.org <caseq@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-31 11:34:23 +0000 |
commit | 099d90b99b4acc2a4d433b2df3ec1c4ed9483f81 (patch) | |
tree | e108ec0c887f56749710344c5c0fdd243f558f20 /remoting/host/it2me | |
parent | 5a6065983ac13ab155c76fa95347a29a7ec34f36 (diff) | |
download | chromium_src-099d90b99b4acc2a4d433b2df3ec1c4ed9483f81.zip chromium_src-099d90b99b4acc2a4d433b2df3ec1c4ed9483f81.tar.gz chromium_src-099d90b99b4acc2a4d433b2df3ec1c4ed9483f81.tar.bz2 |
Revert of It2me native messaging host: webapp implementation. (https://codereview.chromium.org/138503009/)
Reason for revert:
Broke mac build again: http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Mac/builds/16217
Original issue's description:
> It2me native messaging host: webapp implementation.
>
> The webapp implementation of the it2me native messaging is based on the me2me couterpart. But I got rid of the per-message onDone/onError callbacks because unlike me2me, all requests to the it2me host are asynchronous: direct responses to all requests are meaningless. Only the asynchronous callbacks on host state change and nat policy update need to be processed.
>
> I verified that this is fully functional on Linux. Windows and Mac verification haven't been done and are planned after the linux work is completed.
>
> BUG=309844
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=248072
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=248157
TBR=jamiewalch@chromium.org,lambroslambrou@chromium.org,sergeyu@chromium.org,weitaosu@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=309844
Review URL: https://codereview.chromium.org/150983004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248168 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/it2me')
-rw-r--r-- | remoting/host/it2me/it2me_native_messaging_host_main.cc | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/remoting/host/it2me/it2me_native_messaging_host_main.cc b/remoting/host/it2me/it2me_native_messaging_host_main.cc index 87f3d6a..2dca61f 100644 --- a/remoting/host/it2me/it2me_native_messaging_host_main.cc +++ b/remoting/host/it2me/it2me_native_messaging_host_main.cc @@ -4,71 +4,16 @@ #include "base/at_exit.h" #include "base/command_line.h" -#include "base/i18n/icu_util.h" -#include "base/mac/scoped_nsautorelease_pool.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" -#include "media/base/media.h" -#include "net/socket/ssl_server_socket.h" -#include "remoting/base/resources.h" #include "remoting/host/it2me/it2me_native_messaging_host.h" #include "remoting/host/logging.h" -#if defined(OS_LINUX) -#include <gtk/gtk.h> -#endif // defined(OS_LINUX) - -#if defined(OS_WIN) -#include <commctrl.h> -#endif // defined(OS_WIN) - namespace remoting { // Creates a It2MeNativeMessagingHost instance, attaches it to stdin/stdout and // runs the message loop until It2MeNativeMessagingHost signals shutdown. int It2MeNativeMessagingHostMain() { -#if defined(OS_MACOSX) - // Needed so we don't leak objects when threads are created. - base::mac::ScopedNSAutoreleasePool pool; -#endif - -#if defined(REMOTING_ENABLE_BREAKPAD) - // Initialize Breakpad as early as possible. On Mac the command-line needs to - // be initialized first, so that the preference for crash-reporting can be - // looked up in the config file. - if (IsUsageStatsAllowed()) { - InitializeCrashReporting(); - } -#endif // defined(REMOTING_ENABLE_BREAKPAD) - -#if defined(OS_WIN) - // Register and initialize common controls. - INITCOMMONCONTROLSEX info; - info.dwSize = sizeof(info); - info.dwICC = ICC_STANDARD_CLASSES; - InitCommonControlsEx(&info); -#endif // defined(OS_WIN) - - // Required to find the ICU data file, used by some file_util routines. - base::i18n::InitializeICU(); - - remoting::LoadResources(""); - - // Cannot use TOOLKIT_GTK because it is not defined when aura is enabled. -#if defined(OS_LINUX) - // Required for any calls into GTK functions, such as the Disconnect and - // Continue windows. Calling with NULL arguments because we don't have - // any command line arguments for gtk to consume. - gtk_init(NULL, NULL); -#endif // OS_LINUX - - // Enable support for SSL server sockets, which must be done while still - // single-threaded. - net::EnableSSLServerSockets(); - - // Ensures runtime specific CPU features are initialized. - media::InitializeCPUSpecificMediaFeatures(); - #if defined(OS_WIN) // GetStdHandle() returns pseudo-handles for stdin and stdout even if // the hosting executable specifies "Windows" subsystem. However the returned @@ -103,7 +48,6 @@ int It2MeNativeMessagingHostMain() { // Run the loop until channel is alive. run_loop.Run(); - return kSuccessExitCode; } |