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 | 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 Loading... | |
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 #if defined(ENABLE_WEBRTC) | |
jamesr
2013/09/06 22:39:57
same here. notice there are already a set of condi
kjellander_chromium
2013/09/09 09:26:09
Done.
| |
103 #include "content/renderer/media/rtc_peer_connection_handler.h" | 104 #include "content/renderer/media/rtc_peer_connection_handler.h" |
105 #endif | |
104 #include "content/renderer/media/video_capture_impl_manager.h" | 106 #include "content/renderer/media/video_capture_impl_manager.h" |
105 #include "content/renderer/media/webmediaplayer_impl.h" | 107 #include "content/renderer/media/webmediaplayer_impl.h" |
106 #include "content/renderer/media/webmediaplayer_ms.h" | 108 #include "content/renderer/media/webmediaplayer_ms.h" |
107 #include "content/renderer/media/webmediaplayer_params.h" | 109 #include "content/renderer/media/webmediaplayer_params.h" |
108 #include "content/renderer/mhtml_generator.h" | 110 #include "content/renderer/mhtml_generator.h" |
109 #include "content/renderer/notification_provider.h" | 111 #include "content/renderer/notification_provider.h" |
110 #include "content/renderer/render_frame_impl.h" | 112 #include "content/renderer/render_frame_impl.h" |
111 #include "content/renderer/render_process.h" | 113 #include "content/renderer/render_process.h" |
112 #include "content/renderer/render_thread_impl.h" | 114 #include "content/renderer/render_thread_impl.h" |
113 #include "content/renderer/render_view_impl_params.h" | 115 #include "content/renderer/render_view_impl_params.h" |
(...skipping 6408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
6522 for (size_t i = 0; i < icon_urls.size(); i++) { | 6524 for (size_t i = 0; i < icon_urls.size(); i++) { |
6523 WebURL url = icon_urls[i].iconURL(); | 6525 WebURL url = icon_urls[i].iconURL(); |
6524 if (!url.isEmpty()) | 6526 if (!url.isEmpty()) |
6525 urls.push_back(FaviconURL(url, | 6527 urls.push_back(FaviconURL(url, |
6526 ToFaviconType(icon_urls[i].iconType()))); | 6528 ToFaviconType(icon_urls[i].iconType()))); |
6527 } | 6529 } |
6528 SendUpdateFaviconURL(urls); | 6530 SendUpdateFaviconURL(urls); |
6529 } | 6531 } |
6530 | 6532 |
6531 } // namespace content | 6533 } // namespace content |
OLD | NEW |