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

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

Issue 23749003: Protect WebRTC code in content/renderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved the include according to reviewer suggestion. Created 7 years, 3 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
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 #include "content/renderer/internal_document_state_data.h" 93 #include "content/renderer/internal_document_state_data.h"
94 #include "content/renderer/java/java_bridge_dispatcher.h" 94 #include "content/renderer/java/java_bridge_dispatcher.h"
95 #include "content/renderer/load_progress_tracker.h" 95 #include "content/renderer/load_progress_tracker.h"
96 #include "content/renderer/media/audio_device_factory.h" 96 #include "content/renderer/media/audio_device_factory.h"
97 #include "content/renderer/media/audio_renderer_mixer_manager.h" 97 #include "content/renderer/media/audio_renderer_mixer_manager.h"
98 #include "content/renderer/media/media_stream_dependency_factory.h" 98 #include "content/renderer/media/media_stream_dependency_factory.h"
99 #include "content/renderer/media/media_stream_dispatcher.h" 99 #include "content/renderer/media/media_stream_dispatcher.h"
100 #include "content/renderer/media/media_stream_impl.h" 100 #include "content/renderer/media/media_stream_impl.h"
101 #include "content/renderer/media/midi_dispatcher.h" 101 #include "content/renderer/media/midi_dispatcher.h"
102 #include "content/renderer/media/render_media_log.h" 102 #include "content/renderer/media/render_media_log.h"
103 #include "content/renderer/media/rtc_peer_connection_handler.h"
104 #include "content/renderer/media/video_capture_impl_manager.h" 103 #include "content/renderer/media/video_capture_impl_manager.h"
105 #include "content/renderer/media/webmediaplayer_impl.h" 104 #include "content/renderer/media/webmediaplayer_impl.h"
106 #include "content/renderer/media/webmediaplayer_ms.h" 105 #include "content/renderer/media/webmediaplayer_ms.h"
107 #include "content/renderer/media/webmediaplayer_params.h" 106 #include "content/renderer/media/webmediaplayer_params.h"
108 #include "content/renderer/mhtml_generator.h" 107 #include "content/renderer/mhtml_generator.h"
109 #include "content/renderer/notification_provider.h" 108 #include "content/renderer/notification_provider.h"
110 #include "content/renderer/render_frame_impl.h" 109 #include "content/renderer/render_frame_impl.h"
111 #include "content/renderer/render_process.h" 110 #include "content/renderer/render_process.h"
112 #include "content/renderer/render_thread_impl.h" 111 #include "content/renderer/render_thread_impl.h"
113 #include "content/renderer/render_view_impl_params.h" 112 #include "content/renderer/render_view_impl_params.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 #if defined(ENABLE_PLUGINS) 241 #if defined(ENABLE_PLUGINS)
243 #include "content/renderer/npapi/webplugin_delegate_proxy.h" 242 #include "content/renderer/npapi/webplugin_delegate_proxy.h"
244 #include "content/renderer/npapi/webplugin_impl.h" 243 #include "content/renderer/npapi/webplugin_impl.h"
245 #include "content/renderer/pepper/pepper_browser_connection.h" 244 #include "content/renderer/pepper/pepper_browser_connection.h"
246 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" 245 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
247 #include "content/renderer/pepper/pepper_plugin_registry.h" 246 #include "content/renderer/pepper/pepper_plugin_registry.h"
248 #include "content/renderer/pepper/pepper_webplugin_impl.h" 247 #include "content/renderer/pepper/pepper_webplugin_impl.h"
249 #include "content/renderer/pepper/plugin_module.h" 248 #include "content/renderer/pepper/plugin_module.h"
250 #endif 249 #endif
251 250
251 #if defined(ENABLE_WEBRTC)
252 #include "content/renderer/media/rtc_peer_connection_handler.h"
253 #endif
254
252 using WebKit::WebAXObject; 255 using WebKit::WebAXObject;
253 using WebKit::WebApplicationCacheHost; 256 using WebKit::WebApplicationCacheHost;
254 using WebKit::WebApplicationCacheHostClient; 257 using WebKit::WebApplicationCacheHostClient;
255 using WebKit::WebCString; 258 using WebKit::WebCString;
256 using WebKit::WebColor; 259 using WebKit::WebColor;
257 using WebKit::WebColorName; 260 using WebKit::WebColorName;
258 using WebKit::WebConsoleMessage; 261 using WebKit::WebConsoleMessage;
259 using WebKit::WebContextMenuData; 262 using WebKit::WebContextMenuData;
260 using WebKit::WebCookieJar; 263 using WebKit::WebCookieJar;
261 using WebKit::WebData; 264 using WebKit::WebData;
(...skipping 6256 matching lines...) Expand 10 before | Expand all | Expand 10 after
6518 for (size_t i = 0; i < icon_urls.size(); i++) { 6521 for (size_t i = 0; i < icon_urls.size(); i++) {
6519 WebURL url = icon_urls[i].iconURL(); 6522 WebURL url = icon_urls[i].iconURL();
6520 if (!url.isEmpty()) 6523 if (!url.isEmpty())
6521 urls.push_back(FaviconURL(url, 6524 urls.push_back(FaviconURL(url,
6522 ToFaviconType(icon_urls[i].iconType()))); 6525 ToFaviconType(icon_urls[i].iconType())));
6523 } 6526 }
6524 SendUpdateFaviconURL(urls); 6527 SendUpdateFaviconURL(urls);
6525 } 6528 }
6526 6529
6527 } // namespace content 6530 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698