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/plugin_data_remover_impl.h" | 5 #include "content/browser/plugin_data_remover_impl.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
11 #include "base/sequenced_task_runner_helpers.h" | 11 #include "base/sequenced_task_runner_helpers.h" |
12 #include "base/synchronization/waitable_event.h" | 12 #include "base/synchronization/waitable_event.h" |
13 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
14 #include "base/version.h" | 14 #include "base/version.h" |
15 #include "content/browser/plugin_process_host.h" | 15 #include "content/browser/plugin_process_host.h" |
16 #include "content/browser/plugin_service_impl.h" | 16 #include "content/browser/plugin_service_impl.h" |
17 #include "content/browser/renderer_host/pepper/pepper_file_message_filter.h" | 17 #include "content/browser/renderer_host/pepper/pepper_flash_file_host.h" |
18 #include "content/common/child_process_host_impl.h" | 18 #include "content/common/child_process_host_impl.h" |
19 #include "content/common/plugin_messages.h" | 19 #include "content/common/plugin_messages.h" |
20 #include "content/public/browser/browser_context.h" | 20 #include "content/public/browser/browser_context.h" |
21 #include "content/public/browser/browser_thread.h" | 21 #include "content/public/browser/browser_thread.h" |
22 #include "content/public/common/pepper_plugin_info.h" | 22 #include "content/public/common/pepper_plugin_info.h" |
23 #include "ppapi/proxy/ppapi_messages.h" | 23 #include "ppapi/proxy/ppapi_messages.h" |
24 #include "webkit/plugins/npapi/plugin_utils.h" | 24 #include "webkit/plugins/npapi/plugin_utils.h" |
25 #include "webkit/plugins/plugin_constants.h" | 25 #include "webkit/plugins/plugin_constants.h" |
26 | 26 |
27 namespace content { | 27 namespace content { |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
216 return; | 216 return; |
217 } | 217 } |
218 | 218 |
219 uint64 max_age = begin_time_.is_null() ? | 219 uint64 max_age = begin_time_.is_null() ? |
220 std::numeric_limits<uint64>::max() : | 220 std::numeric_limits<uint64>::max() : |
221 (base::Time::Now() - begin_time_).InSeconds(); | 221 (base::Time::Now() - begin_time_).InSeconds(); |
222 | 222 |
223 IPC::Message* msg; | 223 IPC::Message* msg; |
224 if (is_ppapi) { | 224 if (is_ppapi) { |
225 FilePath profile_path = | 225 FilePath profile_path = |
226 PepperFileMessageFilter::GetDataDirName(browser_context_path_); | 226 PepperFlashFileHost::GetDataDirName(browser_context_path_); |
227 // TODO(vtl): This "duplicates" logic in webkit/plugins/ppapi/file_path.cc | 227 // TODO(vtl): This "duplicates" logic in webkit/plugins/ppapi/file_path.cc |
228 // (which prepends the plugin name to the relative part of the path | 228 // (which prepends the plugin name to the relative part of the path |
229 // instead, with the absolute, profile-dependent part being enforced by | 229 // instead, with the absolute, profile-dependent part being enforced by |
230 // the browser). | 230 // the browser). |
231 #if defined(OS_WIN) | 231 #if defined(OS_WIN) |
232 FilePath plugin_data_path = | 232 FilePath plugin_data_path = |
233 profile_path.Append(FilePath(UTF8ToUTF16(plugin_name_))); | 233 profile_path.Append(FilePath(UTF8ToUTF16(plugin_name_))); |
234 #else | 234 #else |
235 FilePath plugin_data_path = profile_path.Append(FilePath(plugin_name_)); | 235 FilePath plugin_data_path = profile_path.Append(FilePath(plugin_name_)); |
236 #endif | 236 #endif |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
304 | 304 |
305 base::WaitableEvent* PluginDataRemoverImpl::StartRemoving( | 305 base::WaitableEvent* PluginDataRemoverImpl::StartRemoving( |
306 base::Time begin_time) { | 306 base::Time begin_time) { |
307 DCHECK(!context_.get()); | 307 DCHECK(!context_.get()); |
308 context_ = new Context(begin_time, browser_context_); | 308 context_ = new Context(begin_time, browser_context_); |
309 context_->Init(mime_type_); | 309 context_->Init(mime_type_); |
310 return context_->event(); | 310 return context_->event(); |
311 } | 311 } |
312 | 312 |
313 } // namespace content | 313 } // namespace content |
OLD | NEW |