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

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

Issue 326043002: Cleanup: Remove more dead GTK code. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
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 "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/i18n/icu_util.h" 9 #include "base/i18n/icu_util.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "media/base/media.h" 12 #include "media/base/media.h"
13 #include "net/socket/ssl_server_socket.h" 13 #include "net/socket/ssl_server_socket.h"
14 #include "remoting/base/breakpad.h" 14 #include "remoting/base/breakpad.h"
15 #include "remoting/base/resources.h" 15 #include "remoting/base/resources.h"
16 #include "remoting/host/host_exit_codes.h" 16 #include "remoting/host/host_exit_codes.h"
17 #include "remoting/host/it2me/it2me_native_messaging_host.h" 17 #include "remoting/host/it2me/it2me_native_messaging_host.h"
18 #include "remoting/host/logging.h" 18 #include "remoting/host/logging.h"
19 #include "remoting/host/usage_stats_consent.h" 19 #include "remoting/host/usage_stats_consent.h"
20 20
21 #if defined(OS_LINUX)
22 #include <gtk/gtk.h>
23 #endif // defined(OS_LINUX)
24
25 #if defined(OS_MACOSX) 21 #if defined(OS_MACOSX)
26 #include "base/mac/scoped_nsautorelease_pool.h" 22 #include "base/mac/scoped_nsautorelease_pool.h"
27 #endif // defined(OS_MACOSX) 23 #endif // defined(OS_MACOSX)
28 24
29 #if defined(OS_WIN) 25 #if defined(OS_WIN)
30 #include <commctrl.h> 26 #include <commctrl.h>
31 #endif // defined(OS_WIN) 27 #endif // defined(OS_WIN)
32 28
33 namespace remoting { 29 namespace remoting {
34 30
(...skipping 20 matching lines...) Expand all
55 info.dwSize = sizeof(info); 51 info.dwSize = sizeof(info);
56 info.dwICC = ICC_STANDARD_CLASSES; 52 info.dwICC = ICC_STANDARD_CLASSES;
57 InitCommonControlsEx(&info); 53 InitCommonControlsEx(&info);
58 #endif // defined(OS_WIN) 54 #endif // defined(OS_WIN)
59 55
60 // Required to find the ICU data file, used by some file_util routines. 56 // Required to find the ICU data file, used by some file_util routines.
61 base::i18n::InitializeICU(); 57 base::i18n::InitializeICU();
62 58
63 remoting::LoadResources(""); 59 remoting::LoadResources("");
64 60
65 // Cannot use TOOLKIT_GTK because it is not defined when aura is enabled.
Sergey Ulanov 2014/06/10 05:29:39 Please don't remove this stuff. We still use GTK i
66 #if defined(OS_LINUX)
67 // Required for any calls into GTK functions, such as the Disconnect and
68 // Continue windows. Calling with NULL arguments because we don't have
69 // any command line arguments for gtk to consume.
70 gtk_init(NULL, NULL);
71 #endif // OS_LINUX
72
73 // Enable support for SSL server sockets, which must be done while still 61 // Enable support for SSL server sockets, which must be done while still
74 // single-threaded. 62 // single-threaded.
75 net::EnableSSLServerSockets(); 63 net::EnableSSLServerSockets();
76 64
77 // Ensures runtime specific CPU features are initialized. 65 // Ensures runtime specific CPU features are initialized.
78 media::InitializeCPUSpecificMediaFeatures(); 66 media::InitializeCPUSpecificMediaFeatures();
79 67
80 #if defined(OS_WIN) 68 #if defined(OS_WIN)
81 // GetStdHandle() returns pseudo-handles for stdin and stdout even if 69 // GetStdHandle() returns pseudo-handles for stdin and stdout even if
82 // the hosting executable specifies "Windows" subsystem. However the returned 70 // the hosting executable specifies "Windows" subsystem. However the returned
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 // This object instance is required by Chrome code (such as MessageLoop). 119 // This object instance is required by Chrome code (such as MessageLoop).
132 base::AtExitManager exit_manager; 120 base::AtExitManager exit_manager;
133 121
134 base::CommandLine::Init(argc, argv); 122 base::CommandLine::Init(argc, argv);
135 remoting::InitHostLogging(); 123 remoting::InitHostLogging();
136 124
137 return StartIt2MeNativeMessagingHost(); 125 return StartIt2MeNativeMessagingHost();
138 } 126 }
139 127
140 } // namespace remoting 128 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698