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

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

Issue 8340028: Salient parts of http://codereview.chromium.org/8392042/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 1 month 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_service.h" 5 #include "content/browser/plugin_service.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "base/message_loop_proxy.h" 12 #include "base/message_loop_proxy.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/synchronization/waitable_event.h" 15 #include "base/synchronization/waitable_event.h"
16 #include "base/threading/thread.h" 16 #include "base/threading/thread.h"
17 #include "base/utf_string_conversions.h" 17 #include "base/utf_string_conversions.h"
18 #include "base/values.h" 18 #include "base/values.h"
19 #include "content/browser/browser_thread.h"
20 #include "content/browser/plugin_loader_posix.h" 19 #include "content/browser/plugin_loader_posix.h"
21 #include "content/browser/plugin_service_filter.h" 20 #include "content/browser/plugin_service_filter.h"
22 #include "content/browser/ppapi_plugin_process_host.h" 21 #include "content/browser/ppapi_plugin_process_host.h"
23 #include "content/browser/renderer_host/render_process_host.h" 22 #include "content/browser/renderer_host/render_process_host.h"
24 #include "content/browser/renderer_host/render_view_host.h" 23 #include "content/browser/renderer_host/render_view_host.h"
25 #include "content/browser/resource_context.h" 24 #include "content/browser/resource_context.h"
26 #include "content/browser/utility_process_host.h" 25 #include "content/browser/utility_process_host.h"
27 #include "content/public/browser/notification_service.h"
28 #include "content/common/pepper_plugin_registry.h" 26 #include "content/common/pepper_plugin_registry.h"
29 #include "content/common/plugin_messages.h" 27 #include "content/common/plugin_messages.h"
30 #include "content/common/utility_messages.h" 28 #include "content/common/utility_messages.h"
31 #include "content/common/view_messages.h" 29 #include "content/common/view_messages.h"
30 #include "content/public/browser/browser_thread.h"
32 #include "content/public/browser/content_browser_client.h" 31 #include "content/public/browser/content_browser_client.h"
32 #include "content/public/browser/notification_service.h"
33 #include "content/public/browser/notification_types.h" 33 #include "content/public/browser/notification_types.h"
34 #include "content/public/common/content_switches.h" 34 #include "content/public/common/content_switches.h"
35 #include "webkit/plugins/npapi/plugin_constants_win.h" 35 #include "webkit/plugins/npapi/plugin_constants_win.h"
36 #include "webkit/plugins/npapi/plugin_group.h" 36 #include "webkit/plugins/npapi/plugin_group.h"
37 #include "webkit/plugins/npapi/plugin_list.h" 37 #include "webkit/plugins/npapi/plugin_list.h"
38 #include "webkit/plugins/webplugininfo.h" 38 #include "webkit/plugins/webplugininfo.h"
39 39
40 #if defined(OS_POSIX) && !defined(OS_MACOSX) 40 #if defined(OS_POSIX) && !defined(OS_MACOSX)
41 using ::base::files::FilePathWatcher; 41 using ::base::files::FilePathWatcher;
42 #endif 42 #endif
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 #if defined(OS_POSIX) && !defined(OS_MACOSX) 616 #if defined(OS_POSIX) && !defined(OS_MACOSX)
617 // static 617 // static
618 void PluginService::RegisterFilePathWatcher( 618 void PluginService::RegisterFilePathWatcher(
619 FilePathWatcher *watcher, 619 FilePathWatcher *watcher,
620 const FilePath& path, 620 const FilePath& path,
621 FilePathWatcher::Delegate* delegate) { 621 FilePathWatcher::Delegate* delegate) {
622 bool result = watcher->Watch(path, delegate); 622 bool result = watcher->Watch(path, delegate);
623 DCHECK(result); 623 DCHECK(result);
624 } 624 }
625 #endif 625 #endif
OLDNEW
« no previous file with comments | « content/browser/plugin_process_host_mac.cc ('k') | content/browser/plugin_service_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698