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/browser/renderer_host/pepper/browser_ppapi_host_impl.h" | 5 #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" |
6 | 6 |
7 #include "base/metrics/sparse_histogram.h" | 7 #include "base/metrics/sparse_histogram.h" |
8 #include "content/browser/renderer_host/pepper/pepper_message_filter.h" | 8 #include "content/browser/renderer_host/pepper/pepper_message_filter.h" |
9 #include "content/browser/tracing/trace_message_filter.h" | 9 #include "content/browser/tracing/trace_message_filter.h" |
10 #include "content/common/pepper_renderer_instance_data.h" | 10 #include "content/common/pepper_renderer_instance_data.h" |
(...skipping 19 matching lines...) Expand all Loading... |
30 std::string(), | 30 std::string(), |
31 base::FilePath(), | 31 base::FilePath(), |
32 profile_directory, | 32 profile_directory, |
33 false /* in_process */, | 33 false /* in_process */, |
34 true /* external_plugin */); | 34 true /* external_plugin */); |
35 browser_ppapi_host->set_plugin_process_handle(plugin_child_process); | 35 browser_ppapi_host->set_plugin_process_handle(plugin_child_process); |
36 | 36 |
37 scoped_refptr<PepperMessageFilter> pepper_message_filter( | 37 scoped_refptr<PepperMessageFilter> pepper_message_filter( |
38 new PepperMessageFilter()); | 38 new PepperMessageFilter()); |
39 channel->AddFilter(pepper_message_filter->GetFilter()); | 39 channel->AddFilter(pepper_message_filter->GetFilter()); |
40 channel->AddFilter(browser_ppapi_host->message_filter()); | 40 channel->AddFilter(browser_ppapi_host->message_filter().get()); |
41 channel->AddFilter((new TraceMessageFilter())->GetFilter()); | 41 channel->AddFilter((new TraceMessageFilter())->GetFilter()); |
42 | 42 |
43 return browser_ppapi_host; | 43 return browser_ppapi_host; |
44 } | 44 } |
45 | 45 |
46 BrowserPpapiHostImpl::BrowserPpapiHostImpl( | 46 BrowserPpapiHostImpl::BrowserPpapiHostImpl( |
47 IPC::Sender* sender, | 47 IPC::Sender* sender, |
48 const ppapi::PpapiPermissions& permissions, | 48 const ppapi::PpapiPermissions& permissions, |
49 const std::string& plugin_name, | 49 const std::string& plugin_name, |
50 const base::FilePath& plugin_path, | 50 const base::FilePath& plugin_path, |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 instance_data[i].render_process_id = instance->second.render_process_id; | 212 instance_data[i].render_process_id = instance->second.render_process_id; |
213 instance_data[i].render_frame_id = instance->second.render_frame_id; | 213 instance_data[i].render_frame_id = instance->second.render_frame_id; |
214 instance_data[i].document_url = instance->second.document_url; | 214 instance_data[i].document_url = instance->second.document_url; |
215 ++instance; | 215 ++instance; |
216 ++i; | 216 ++i; |
217 } | 217 } |
218 on_keepalive_callback_.Run(instance_data, profile_data_directory_); | 218 on_keepalive_callback_.Run(instance_data, profile_data_directory_); |
219 } | 219 } |
220 | 220 |
221 } // namespace content | 221 } // namespace content |
OLD | NEW |