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

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

Issue 326043002: Cleanup: Remove more dead GTK code. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sergeyu comments try 2 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
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 a standalone host process for Me2Me. 5 // This file implements a standalone host process for Me2Me.
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/at_exit.h" 9 #include "base/at_exit.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 #include "remoting/host/audio_capturer_linux.h" 91 #include "remoting/host/audio_capturer_linux.h"
92 #endif // defined(OS_LINUX) 92 #endif // defined(OS_LINUX)
93 93
94 #if defined(OS_WIN) 94 #if defined(OS_WIN)
95 #include <commctrl.h> 95 #include <commctrl.h>
96 #include "base/win/registry.h" 96 #include "base/win/registry.h"
97 #include "base/win/scoped_handle.h" 97 #include "base/win/scoped_handle.h"
98 #include "remoting/host/pairing_registry_delegate_win.h" 98 #include "remoting/host/pairing_registry_delegate_win.h"
99 #include "remoting/host/win/session_desktop_environment.h" 99 #include "remoting/host/win/session_desktop_environment.h"
100 #endif // defined(OS_WIN) 100 #endif // defined(OS_WIN)
101
102 #if defined(TOOLKIT_GTK)
103 #include "ui/gfx/gtk_util.h"
104 #endif // defined(TOOLKIT_GTK)
105
106 using remoting::protocol::PairingRegistry; 101 using remoting::protocol::PairingRegistry;
107 102
108 namespace { 103 namespace {
109 104
110 // This is used for tagging system event logs. 105 // This is used for tagging system event logs.
111 const char kApplicationName[] = "chromoting"; 106 const char kApplicationName[] = "chromoting";
112 107
113 #if defined(OS_LINUX) 108 #if defined(OS_LINUX)
114 // The command line switch used to pass name of the pipe to capture audio on 109 // The command line switch used to pass name of the pipe to capture audio on
115 // linux. 110 // linux.
(...skipping 1196 matching lines...) Expand 10 before | Expand all | Expand 10 after
1312 base::snprintf(message, sizeof(message), 1307 base::snprintf(message, sizeof(message),
1313 "Requested by %s at %s, line %d.", 1308 "Requested by %s at %s, line %d.",
1314 function_name.c_str(), file_name.c_str(), line_number); 1309 function_name.c_str(), file_name.c_str(), line_number);
1315 base::debug::Alias(message); 1310 base::debug::Alias(message);
1316 1311
1317 // The daemon requested us to crash the process. 1312 // The daemon requested us to crash the process.
1318 CHECK(false) << message; 1313 CHECK(false) << message;
1319 } 1314 }
1320 1315
1321 int HostProcessMain() { 1316 int HostProcessMain() {
1322 #if defined(TOOLKIT_GTK) 1317 #if defined(OS_LINUX)
1323 // Required for any calls into GTK functions, such as the Disconnect and 1318 // Required for any calls into GTK functions, such as the Disconnect and
1324 // Continue windows, though these should not be used for the Me2Me case 1319 // Continue windows, though these should not be used for the Me2Me case
1325 // (crbug.com/104377). 1320 // (crbug.com/104377).
1326 gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess()); 1321 gtk_init(NULL, NULL);
Sergey Ulanov 2014/06/10 07:58:38 Please add #include <gtk/gtk.h>
1327 #endif // TOOLKIT_GTK 1322 #endif
1328 1323
1329 // Enable support for SSL server sockets, which must be done while still 1324 // Enable support for SSL server sockets, which must be done while still
1330 // single-threaded. 1325 // single-threaded.
1331 net::EnableSSLServerSockets(); 1326 net::EnableSSLServerSockets();
1332 1327
1333 // Ensures runtime specific CPU features are initialized. 1328 // Ensures runtime specific CPU features are initialized.
1334 media::InitializeCPUSpecificMediaFeatures(); 1329 media::InitializeCPUSpecificMediaFeatures();
1335 1330
1336 // Create the main message loop and start helper threads. 1331 // Create the main message loop and start helper threads.
1337 base::MessageLoopForUI message_loop; 1332 base::MessageLoopForUI message_loop;
(...skipping 15 matching lines...) Expand all
1353 return exit_code; 1348 return exit_code;
1354 } 1349 }
1355 1350
1356 } // namespace remoting 1351 } // namespace remoting
1357 1352
1358 #if !defined(OS_WIN) 1353 #if !defined(OS_WIN)
1359 int main(int argc, char** argv) { 1354 int main(int argc, char** argv) {
1360 return remoting::HostMain(argc, argv); 1355 return remoting::HostMain(argc, argv);
1361 } 1356 }
1362 #endif // !defined(OS_WIN) 1357 #endif // !defined(OS_WIN)
OLDNEW
« no previous file with comments | « content/browser/browser_main_loop.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698