Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 #include "content/shell/shell_render_process_observer.h" | 5 #include "content/shell/shell_render_process_observer.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "content/public/renderer/render_thread.h" | 8 #include "content/public/renderer/render_thread.h" |
| 9 #include "content/shell/layout_test_controller_bindings.h" | 9 #include "content/shell/layout_test_controller_bindings.h" |
| 10 #include "content/shell/shell_switches.h" | 10 #include "content/shell/shell_switches.h" |
| 11 #include "media/base/media.h" | |
| 12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" | |
| 13 | |
| 14 using WebKit::WebRuntimeFeatures; | |
| 11 | 15 |
| 12 namespace content { | 16 namespace content { |
| 13 | 17 |
| 14 ShellRenderProcessObserver::ShellRenderProcessObserver() { | 18 ShellRenderProcessObserver::ShellRenderProcessObserver() { |
| 15 RenderThread::Get()->AddObserver(this); | 19 RenderThread::Get()->AddObserver(this); |
| 16 } | 20 } |
| 17 | 21 |
| 18 ShellRenderProcessObserver::~ShellRenderProcessObserver() { | 22 ShellRenderProcessObserver::~ShellRenderProcessObserver() { |
| 19 } | 23 } |
| 20 | 24 |
| 21 void ShellRenderProcessObserver::WebKitInitialized() { | 25 void ShellRenderProcessObserver::WebKitInitialized() { |
| 22 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) | 26 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) |
| 23 RenderThread::Get()->RegisterExtension(new LayoutTestControllerBindings()); | 27 RenderThread::Get()->RegisterExtension(new LayoutTestControllerBindings()); |
| 28 WebRuntimeFeatures::enableMediaPlayer(media::IsMediaLibraryInitialized()); | |
|
jam
2012/02/03 00:49:44
ditto
vrk (LEFT CHROMIUM)
2012/03/06 02:07:50
Done.
| |
| 24 } | 29 } |
| 25 | 30 |
| 26 } // namespace content | 31 } // namespace content |
| OLD | NEW |