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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 9295018: Move audio/video files from content/renderer into content/renderer/media. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 10 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
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 #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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h" 55 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h"
56 #include "content/renderer/idle_user_detector.h" 56 #include "content/renderer/idle_user_detector.h"
57 #include "content/renderer/web_intents_host.h" 57 #include "content/renderer/web_intents_host.h"
58 #include "content/renderer/java/java_bridge_dispatcher.h" 58 #include "content/renderer/java/java_bridge_dispatcher.h"
59 #include "content/renderer/load_progress_tracker.h" 59 #include "content/renderer/load_progress_tracker.h"
60 #include "content/renderer/media/audio_message_filter.h" 60 #include "content/renderer/media/audio_message_filter.h"
61 #include "content/renderer/media/audio_renderer_impl.h" 61 #include "content/renderer/media/audio_renderer_impl.h"
62 #include "content/renderer/media/media_stream_dependency_factory.h" 62 #include "content/renderer/media/media_stream_dependency_factory.h"
63 #include "content/renderer/media/media_stream_dispatcher.h" 63 #include "content/renderer/media/media_stream_dispatcher.h"
64 #include "content/renderer/media/media_stream_impl.h" 64 #include "content/renderer/media/media_stream_impl.h"
65 #include "content/renderer/media/render_audiosourceprovider.h"
65 #include "content/renderer/media/render_media_log.h" 66 #include "content/renderer/media/render_media_log.h"
67 #include "content/renderer/media/renderer_gpu_video_decoder_factories.h"
66 #include "content/renderer/mhtml_generator.h" 68 #include "content/renderer/mhtml_generator.h"
67 #include "content/renderer/mouse_lock_dispatcher.h" 69 #include "content/renderer/mouse_lock_dispatcher.h"
68 #include "content/renderer/notification_provider.h" 70 #include "content/renderer/notification_provider.h"
69 #include "content/renderer/p2p/socket_dispatcher.h" 71 #include "content/renderer/p2p/socket_dispatcher.h"
70 #include "content/renderer/plugin_channel_host.h" 72 #include "content/renderer/plugin_channel_host.h"
71 #include "content/renderer/render_audiosourceprovider.h"
72 #include "content/renderer/render_process.h" 73 #include "content/renderer/render_process.h"
73 #include "content/renderer/render_thread_impl.h" 74 #include "content/renderer/render_thread_impl.h"
74 #include "content/renderer/render_widget_fullscreen_pepper.h" 75 #include "content/renderer/render_widget_fullscreen_pepper.h"
75 #include "content/renderer/renderer_accessibility.h" 76 #include "content/renderer/renderer_accessibility.h"
76 #include "content/renderer/renderer_gpu_video_decoder_factories.h"
77 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 77 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
78 #include "content/renderer/renderer_webstoragenamespace_impl.h" 78 #include "content/renderer/renderer_webstoragenamespace_impl.h"
79 #include "content/renderer/speech_input_dispatcher.h" 79 #include "content/renderer/speech_input_dispatcher.h"
80 #include "content/renderer/text_input_client_observer.h" 80 #include "content/renderer/text_input_client_observer.h"
81 #include "content/renderer/v8_value_converter_impl.h" 81 #include "content/renderer/v8_value_converter_impl.h"
82 #include "content/renderer/web_ui_bindings.h" 82 #include "content/renderer/web_ui_bindings.h"
83 #include "content/renderer/webplugin_delegate_proxy.h" 83 #include "content/renderer/webplugin_delegate_proxy.h"
84 #include "content/renderer/websharedworker_proxy.h" 84 #include "content/renderer/websharedworker_proxy.h"
85 #include "media/base/filter_collection.h" 85 #include "media/base/filter_collection.h"
86 #include "media/base/media_switches.h" 86 #include "media/base/media_switches.h"
(...skipping 4861 matching lines...) Expand 10 before | Expand all | Expand 10 after
4948 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 4948 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
4949 return !!RenderThreadImpl::current()->compositor_thread(); 4949 return !!RenderThreadImpl::current()->compositor_thread();
4950 } 4950 }
4951 4951
4952 void RenderViewImpl::OnJavaBridgeInit() { 4952 void RenderViewImpl::OnJavaBridgeInit() {
4953 DCHECK(!java_bridge_dispatcher_.get()); 4953 DCHECK(!java_bridge_dispatcher_.get());
4954 #if defined(ENABLE_JAVA_BRIDGE) 4954 #if defined(ENABLE_JAVA_BRIDGE)
4955 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); 4955 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
4956 #endif 4956 #endif
4957 } 4957 }
OLDNEW
« no previous file with comments | « content/renderer/pepper_plugin_delegate_impl.cc ('k') | content/renderer/renderer_webkitplatformsupport_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698