diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 20:05:01 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 20:05:01 +0000 |
| commit | 66980d85fefe26261b310f35375a31bb91abd0c3 (patch) | |
| tree | 43298b3d634c9e7cc0b887b12f4ba42957d10253 /chrome/service | |
| parent | 9d0b0fbfc061a1889ae18fbefa92f7b73b065750 (diff) | |
| download | chromium_src-66980d85fefe26261b310f35375a31bb91abd0c3.zip chromium_src-66980d85fefe26261b310f35375a31bb91abd0c3.tar.gz chromium_src-66980d85fefe26261b310f35375a31bb91abd0c3.tar.bz2 | |
Implement basic X11 screen capture on linux.
BUG=
TEST=
Review URL: http://codereview.chromium.org/3801012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63401 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service')
| -rw-r--r-- | chrome/service/service_process.cc | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc index 673eed4..97919cd 100644 --- a/chrome/service/service_process.cc +++ b/chrome/service/service_process.cc @@ -33,7 +33,7 @@ #include "remoting/host/capturer_gdi.h" #include "remoting/host/event_executor_win.h" #elif defined(OS_LINUX) -#include "remoting/host/capturer_fake.h" +#include "remoting/host/capturer_linux.h" #include "remoting/host/event_executor_linux.h" #elif defined(OS_MACOSX) #include "remoting/host/capturer_mac.h" @@ -86,12 +86,19 @@ bool ServiceProcess::Initialize(MessageLoop* message_loop, DictionaryValue* values = service_prefs_->prefs(); bool remoting_host_enabled = false; + // For development, we allow forcing the enabling of the host daemon via a + // commandline flag, regardless of the preference setting. + // + // TODO(ajwong): When we've gotten the preference setting workflow more + // stable, we should remove the command-line flag force-enable. + values->GetBoolean(prefs::kRemotingHostEnabled, &remoting_host_enabled); + remoting_host_enabled |= command_line.HasSwitch(switches::kEnableRemoting); + // Check if remoting host is already enabled. - if (values->GetBoolean(prefs::kRemotingHostEnabled, &remoting_host_enabled) && - remoting_host_enabled) { - // If true then we start the host. + if (remoting_host_enabled) { StartChromotingHost(); } + // Enable Cloud Print if needed. First check the command-line. bool cloud_print_proxy_enabled = command_line.HasSwitch(switches::kEnableCloudPrintProxy); @@ -257,7 +264,7 @@ bool ServiceProcess::StartChromotingHost() { capturer.reset(new remoting::CapturerGdi()); executor.reset(new remoting::EventExecutorWin(capturer.get())); #elif defined(OS_LINUX) - capturer.reset(new remoting::CapturerFake()); + capturer.reset(new remoting::CapturerLinux()); executor.reset(new remoting::EventExecutorLinux(capturer.get())); #elif defined(OS_MACOSX) capturer.reset(new remoting::CapturerMac()); |