| 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/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 430 | 430 |
| 431 OnSetRendererPrefs(renderer_prefs); | 431 OnSetRendererPrefs(renderer_prefs); |
| 432 | 432 |
| 433 host_window_ = parent_hwnd; | 433 host_window_ = parent_hwnd; |
| 434 | 434 |
| 435 #if defined(ENABLE_P2P_APIS) | 435 #if defined(ENABLE_P2P_APIS) |
| 436 if (!p2p_socket_dispatcher_) | 436 if (!p2p_socket_dispatcher_) |
| 437 p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this); | 437 p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this); |
| 438 #endif | 438 #endif |
| 439 | 439 |
| 440 if (!media_stream_dispatcher_) |
| 441 media_stream_dispatcher_ = new MediaStreamDispatcher(this); |
| 442 |
| 440 new MHTMLGenerator(this); | 443 new MHTMLGenerator(this); |
| 441 #if defined(OS_MACOSX) | 444 #if defined(OS_MACOSX) |
| 442 new TextInputClientObserver(this); | 445 new TextInputClientObserver(this); |
| 443 #endif // defined(OS_MACOSX) | 446 #endif // defined(OS_MACOSX) |
| 444 | 447 |
| 445 devtools_agent_ = new DevToolsAgent(this); | 448 devtools_agent_ = new DevToolsAgent(this); |
| 446 | 449 |
| 447 renderer_accessibility_ = new RendererAccessibility(this); | 450 renderer_accessibility_ = new RendererAccessibility(this); |
| 448 | 451 |
| 449 new IdleUserDetector(this); | 452 new IdleUserDetector(this); |
| (...skipping 4462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4912 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 4915 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
| 4913 return !!RenderThreadImpl::current()->compositor_thread(); | 4916 return !!RenderThreadImpl::current()->compositor_thread(); |
| 4914 } | 4917 } |
| 4915 | 4918 |
| 4916 void RenderViewImpl::OnJavaBridgeInit() { | 4919 void RenderViewImpl::OnJavaBridgeInit() { |
| 4917 DCHECK(!java_bridge_dispatcher_.get()); | 4920 DCHECK(!java_bridge_dispatcher_.get()); |
| 4918 #if defined(ENABLE_JAVA_BRIDGE) | 4921 #if defined(ENABLE_JAVA_BRIDGE) |
| 4919 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); | 4922 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); |
| 4920 #endif | 4923 #endif |
| 4921 } | 4924 } |
| OLD | NEW |