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

Side by Side Diff: content/browser/plugin_data_remover_impl.cc

Issue 11450025: Revert 171389 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 | Annotate | Revision Log
« no previous file with comments | « chrome/test/ppapi/ppapi_browsertest.cc ('k') | content/browser/ppapi_plugin_process_host.h » ('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/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 "webkit/plugins/npapi/plugin_utils.h" 23 #include "webkit/plugins/npapi/plugin_utils.h"
24 #include "webkit/plugins/plugin_constants.h" 24 #include "webkit/plugins/plugin_constants.h"
25 25
26 #if defined(ENABLE_PLUGINS) 26 #if defined(ENABLE_PLUGINS)
27 #include "ppapi/proxy/ppapi_messages.h" 27 #include "ppapi/proxy/ppapi_messages.h"
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 base::WaitableEvent* event() { return event_.get(); } 201 base::WaitableEvent* event() { return event_.get(); }
202 202
203 private: 203 private:
204 friend struct BrowserThread::DeleteOnThread<BrowserThread::IO>; 204 friend struct BrowserThread::DeleteOnThread<BrowserThread::IO>;
205 friend class base::DeleteHelper<Context>; 205 friend class base::DeleteHelper<Context>;
206 virtual ~Context() {} 206 virtual ~Context() {}
207 207
208 #if defined(ENABLE_PLUGINS) 208 #if defined(ENABLE_PLUGINS)
209 IPC::Message* CreatePpapiClearSiteDataMsg(uint64 max_age) { 209 IPC::Message* CreatePpapiClearSiteDataMsg(uint64 max_age) {
210 FilePath profile_path = 210 FilePath profile_path =
211 PepperFileMessageFilter::GetDataDirName(browser_context_path_); 211 PepperFlashFileHost::GetDataDirName(browser_context_path_);
212 // TODO(vtl): This "duplicates" logic in webkit/plugins/ppapi/file_path.cc 212 // TODO(vtl): This "duplicates" logic in webkit/plugins/ppapi/file_path.cc
213 // (which prepends the plugin name to the relative part of the path 213 // (which prepends the plugin name to the relative part of the path
214 // instead, with the absolute, profile-dependent part being enforced by 214 // instead, with the absolute, profile-dependent part being enforced by
215 // the browser). 215 // the browser).
216 #if defined(OS_WIN) 216 #if defined(OS_WIN)
217 FilePath plugin_data_path = 217 FilePath plugin_data_path =
218 profile_path.Append(FilePath(UTF8ToUTF16(plugin_name_))); 218 profile_path.Append(FilePath(UTF8ToUTF16(plugin_name_)));
219 #else 219 #else
220 FilePath plugin_data_path = profile_path.Append(FilePath(plugin_name_)); 220 FilePath plugin_data_path = profile_path.Append(FilePath(plugin_name_));
221 #endif // defined(OS_WIN) 221 #endif // defined(OS_WIN)
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 321
322 base::WaitableEvent* PluginDataRemoverImpl::StartRemoving( 322 base::WaitableEvent* PluginDataRemoverImpl::StartRemoving(
323 base::Time begin_time) { 323 base::Time begin_time) {
324 DCHECK(!context_.get()); 324 DCHECK(!context_.get());
325 context_ = new Context(begin_time, browser_context_); 325 context_ = new Context(begin_time, browser_context_);
326 context_->Init(mime_type_); 326 context_->Init(mime_type_);
327 return context_->event(); 327 return context_->event();
328 } 328 }
329 329
330 } // namespace content 330 } // namespace content
OLDNEW
« no previous file with comments | « chrome/test/ppapi/ppapi_browsertest.cc ('k') | content/browser/ppapi_plugin_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698