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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 4085 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4210 std::vector<gfx::Size> sizes; | 4209 std::vector<gfx::Size> sizes; |
4211 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); | 4210 ConvertToFaviconSizes(icon_urls[i].sizes(), &sizes); |
4212 if (!url.isEmpty()) | 4211 if (!url.isEmpty()) |
4213 urls.push_back( | 4212 urls.push_back( |
4214 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); | 4213 FaviconURL(url, ToFaviconType(icon_urls[i].iconType()), sizes)); |
4215 } | 4214 } |
4216 SendUpdateFaviconURL(urls); | 4215 SendUpdateFaviconURL(urls); |
4217 } | 4216 } |
4218 | 4217 |
4219 } // namespace content | 4218 } // namespace content |
OLD | NEW |