diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-11 23:38:32 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-11 23:38:32 +0000 |
| commit | c3e2817dd047de2ec657a3e23ade9e0d04639dbc (patch) | |
| tree | 2887d80dc5e399e3e1b5093facfcd117e6c15810 | |
| parent | 6d886b7494b96793a07fd8974b895102c51ad57e (diff) | |
| download | chromium_src-c3e2817dd047de2ec657a3e23ade9e0d04639dbc.zip chromium_src-c3e2817dd047de2ec657a3e23ade9e0d04639dbc.tar.gz chromium_src-c3e2817dd047de2ec657a3e23ade9e0d04639dbc.tar.bz2 | |
Renderer and test shell now handle --enable-video with SetMediaPlayerAvailable.
Review URL: http://codereview.chromium.org/20268
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9614 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/renderer/render_process.cc | 5 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_main.cc | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/chrome/renderer/render_process.cc b/chrome/renderer/render_process.cc index 1333af7..853693b 100644 --- a/chrome/renderer/render_process.cc +++ b/chrome/renderer/render_process.cc @@ -105,6 +105,11 @@ bool RenderProcess::GlobalInit(const std::wstring &channel_name) { #endif } + if (command_line.HasSwitch(switches::kEnableVideo)) { + // TODO(scherkus): check for any DLL dependencies. + webkit_glue::SetMediaPlayerAvailable(true); + } + ChildProcessFactory<RenderProcess> factory; return ChildProcess::GlobalInit(channel_name, &factory); } diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc index 262c97b..08b8c07 100644 --- a/webkit/tools/test_shell/test_shell_main.cc +++ b/webkit/tools/test_shell/test_shell_main.cc @@ -214,6 +214,11 @@ int main(int argc, char* argv[]) { base::MemoryDebug::DumpAllMemoryInUse(); } + if (parsed_command_line.HasSwitch(test_shell::kEnableVideo)) { + // TODO(scherkus): check for any DLL dependencies. + webkit_glue::SetMediaPlayerAvailable(true); + } + // See if we need to run the tests. if (layout_test_mode) { // Set up for the kind of test requested. |