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

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

Issue 10790075: Rename Capturer to VideoFrameCapturer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased. Created 8 years, 5 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 | « remoting/host/host_mock_objects.cc ('k') | remoting/host/screen_recorder.h » ('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 (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 11 matching lines...) Expand all
22 #include "base/utf_string_conversions.h" 22 #include "base/utf_string_conversions.h"
23 #include "base/win/windows_version.h" 23 #include "base/win/windows_version.h"
24 #include "build/build_config.h" 24 #include "build/build_config.h"
25 #include "crypto/nss_util.h" 25 #include "crypto/nss_util.h"
26 #include "net/base/network_change_notifier.h" 26 #include "net/base/network_change_notifier.h"
27 #include "net/socket/ssl_server_socket.h" 27 #include "net/socket/ssl_server_socket.h"
28 #include "remoting/base/breakpad.h" 28 #include "remoting/base/breakpad.h"
29 #include "remoting/base/constants.h" 29 #include "remoting/base/constants.h"
30 #include "remoting/host/branding.h" 30 #include "remoting/host/branding.h"
31 #include "remoting/host/constants.h" 31 #include "remoting/host/constants.h"
32 #include "remoting/host/capturer.h" 32 #include "remoting/host/video_frame_capturer.h"
33 #include "remoting/host/chromoting_host.h" 33 #include "remoting/host/chromoting_host.h"
34 #include "remoting/host/chromoting_host_context.h" 34 #include "remoting/host/chromoting_host_context.h"
35 #include "remoting/host/desktop_environment.h" 35 #include "remoting/host/desktop_environment.h"
36 #include "remoting/host/event_executor.h" 36 #include "remoting/host/event_executor.h"
37 #include "remoting/host/heartbeat_sender.h" 37 #include "remoting/host/heartbeat_sender.h"
38 #include "remoting/host/host_config.h" 38 #include "remoting/host/host_config.h"
39 #include "remoting/host/host_event_logger.h" 39 #include "remoting/host/host_event_logger.h"
40 #include "remoting/host/host_user_interface.h" 40 #include "remoting/host/host_user_interface.h"
41 #include "remoting/host/json_host_config.h" 41 #include "remoting/host/json_host_config.h"
42 #include "remoting/host/log_to_server.h" 42 #include "remoting/host/log_to_server.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 auth_config_path_ = default_config_dir.Append(kDefaultAuthConfigFile); 121 auth_config_path_ = default_config_dir.Append(kDefaultAuthConfigFile);
122 } 122 }
123 123
124 if (cmd_line->HasSwitch(kHostConfigSwitchName)) { 124 if (cmd_line->HasSwitch(kHostConfigSwitchName)) {
125 host_config_path_ = cmd_line->GetSwitchValuePath(kHostConfigSwitchName); 125 host_config_path_ = cmd_line->GetSwitchValuePath(kHostConfigSwitchName);
126 } else { 126 } else {
127 host_config_path_ = default_config_dir.Append(kDefaultHostConfigFile); 127 host_config_path_ = default_config_dir.Append(kDefaultHostConfigFile);
128 } 128 }
129 129
130 #if defined(OS_LINUX) 130 #if defined(OS_LINUX)
131 Capturer::EnableXDamage(true); 131 VideoFrameCapturer::EnableXDamage(true);
132 #endif 132 #endif
133 } 133 }
134 134
135 void ConfigUpdated() { 135 void ConfigUpdated() {
136 // The timer should be set and cleaned up on the same thread. 136 // The timer should be set and cleaned up on the same thread.
137 DCHECK(message_loop_.message_loop_proxy()->BelongsToCurrentThread()); 137 DCHECK(message_loop_.message_loop_proxy()->BelongsToCurrentThread());
138 138
139 // Call ConfigUpdatedDelayed after a short delay, so that this object won't 139 // Call ConfigUpdatedDelayed after a short delay, so that this object won't
140 // try to read the updated configuration file before it has been 140 // try to read the updated configuration file before it has been
141 // completely written. 141 // completely written.
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 user32.GetFunctionPointer("SetProcessDPIAware")); 603 user32.GetFunctionPointer("SetProcessDPIAware"));
604 set_process_dpi_aware(); 604 set_process_dpi_aware();
605 } 605 }
606 606
607 // CommandLine::Init() ignores the passed |argc| and |argv| on Windows getting 607 // CommandLine::Init() ignores the passed |argc| and |argv| on Windows getting
608 // the command line from GetCommandLineW(), so we can safely pass NULL here. 608 // the command line from GetCommandLineW(), so we can safely pass NULL here.
609 return main(0, NULL); 609 return main(0, NULL);
610 } 610 }
611 611
612 #endif // defined(OS_WIN) 612 #endif // defined(OS_WIN)
OLDNEW
« no previous file with comments | « remoting/host/host_mock_objects.cc ('k') | remoting/host/screen_recorder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698