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

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

Issue 511323003: media: Remove FilterCollection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 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
« no previous file with comments | « content/renderer/media/webmediaplayer_impl.cc ('k') | content/shell/DEPS » ('j') | 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 #include "content/renderer/speech_recognition_dispatcher.h" 104 #include "content/renderer/speech_recognition_dispatcher.h"
105 #include "content/renderer/stats_collection_controller.h" 105 #include "content/renderer/stats_collection_controller.h"
106 #include "content/renderer/stats_collection_observer.h" 106 #include "content/renderer/stats_collection_observer.h"
107 #include "content/renderer/text_input_client_observer.h" 107 #include "content/renderer/text_input_client_observer.h"
108 #include "content/renderer/v8_value_converter_impl.h" 108 #include "content/renderer/v8_value_converter_impl.h"
109 #include "content/renderer/web_ui_extension.h" 109 #include "content/renderer/web_ui_extension.h"
110 #include "content/renderer/web_ui_extension_data.h" 110 #include "content/renderer/web_ui_extension_data.h"
111 #include "content/renderer/web_ui_mojo.h" 111 #include "content/renderer/web_ui_mojo.h"
112 #include "content/renderer/websharedworker_proxy.h" 112 #include "content/renderer/websharedworker_proxy.h"
113 #include "media/audio/audio_output_device.h" 113 #include "media/audio/audio_output_device.h"
114 #include "media/base/filter_collection.h"
115 #include "media/base/media_switches.h" 114 #include "media/base/media_switches.h"
116 #include "media/filters/audio_renderer_impl.h" 115 #include "media/filters/audio_renderer_impl.h"
117 #include "media/filters/gpu_video_accelerator_factories.h" 116 #include "media/filters/gpu_video_accelerator_factories.h"
118 #include "net/base/data_url.h" 117 #include "net/base/data_url.h"
119 #include "net/base/escape.h" 118 #include "net/base/escape.h"
120 #include "net/base/net_errors.h" 119 #include "net/base/net_errors.h"
121 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 120 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
122 #include "net/http/http_util.h" 121 #include "net/http/http_util.h"
123 #include "third_party/WebKit/public/platform/WebCString.h" 122 #include "third_party/WebKit/public/platform/WebCString.h"
124 #include "third_party/WebKit/public/platform/WebConnectionType.h" 123 #include "third_party/WebKit/public/platform/WebConnectionType.h"
(...skipping 4076 matching lines...) Expand 10 before | Expand all | Expand 10 after
4201 std::vector<gfx::Size> sizes; 4200 std::vector<gfx::Size> sizes;
4202 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); 4201 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes);
4203 if (!url.isEmpty()) 4202 if (!url.isEmpty())
4204 urls.push_back( 4203 urls.push_back(
4205 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); 4204 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes));
4206 } 4205 }
4207 SendUpdateFaviconURL(urls); 4206 SendUpdateFaviconURL(urls);
4208 } 4207 }
4209 4208
4210 } // namespace content 4209 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webmediaplayer_impl.cc ('k') | content/shell/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698