OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 // This file provides the embedder's side of random webkit glue functions. | 5 // This file provides the embedder's side of random webkit glue functions. |
6 | 6 |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 | 8 |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
229 const GURL& url, | 229 const GURL& url, |
230 const GURL& policy_url, | 230 const GURL& policy_url, |
231 const GURL& referrer, | 231 const GURL& referrer, |
232 const std::string& frame_origin, | 232 const std::string& frame_origin, |
233 const std::string& main_frame_origin, | 233 const std::string& main_frame_origin, |
234 const std::string& headers, | 234 const std::string& headers, |
235 int load_flags, | 235 int load_flags, |
236 int origin_pid, | 236 int origin_pid, |
237 ResourceType::Type resource_type, | 237 ResourceType::Type resource_type, |
238 int app_cache_context_id, | 238 int app_cache_context_id, |
239 int routing_id) { | 239 int routing_id, |
| 240 const std::string& disposition_fallback_charset) { |
240 ResourceDispatcher* dispatch = RenderThread::current()->resource_dispatcher(); | 241 ResourceDispatcher* dispatch = RenderThread::current()->resource_dispatcher(); |
241 return dispatch->CreateBridge(method, url, policy_url, referrer, | 242 return dispatch->CreateBridge(method, url, policy_url, referrer, |
242 frame_origin, main_frame_origin, headers, | 243 frame_origin, main_frame_origin, headers, |
243 load_flags, origin_pid, resource_type, 0, | 244 load_flags, origin_pid, resource_type, 0, |
244 app_cache_context_id, routing_id); | 245 app_cache_context_id, routing_id, |
| 246 disposition_fallback_charset); |
245 } | 247 } |
246 | 248 |
247 void NotifyCacheStats() { | 249 void NotifyCacheStats() { |
248 // Update the browser about our cache | 250 // Update the browser about our cache |
249 // NOTE: Since this can be called from the plugin process, we might not have | 251 // NOTE: Since this can be called from the plugin process, we might not have |
250 // a RenderThread. Do nothing in that case. | 252 // a RenderThread. Do nothing in that case. |
251 if (!IsPluginProcess()) | 253 if (!IsPluginProcess()) |
252 RenderThread::current()->InformHostOfCacheStatsLater(); | 254 RenderThread::current()->InformHostOfCacheStatsLater(); |
253 } | 255 } |
254 | 256 |
255 | 257 |
256 } // namespace webkit_glue | 258 } // namespace webkit_glue |
OLD | NEW |