OLD | NEW |
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 <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
| 12 #include "base/synchronization/waitable_event.h" |
12 #include "base/threading/thread.h" | 13 #include "base/threading/thread.h" |
13 #include "base/utf_string_conversions.h" | 14 #include "base/utf_string_conversions.h" |
14 #include "base/values.h" | 15 #include "base/values.h" |
15 #include "base/synchronization/waitable_event.h" | |
16 #include "chrome/browser/browser_process.h" | 16 #include "chrome/browser/browser_process.h" |
17 #include "chrome/browser/chrome_plugin_host.h" | 17 #include "chrome/browser/chrome_plugin_host.h" |
18 #include "chrome/browser/extensions/extension_service.h" | 18 #include "chrome/browser/extensions/extension_service.h" |
19 #include "chrome/browser/plugin_updater.h" | 19 #include "chrome/browser/plugin_updater.h" |
20 #include "chrome/browser/profiles/profile.h" | 20 #include "chrome/browser/profiles/profile.h" |
| 21 #include "chrome/common/chrome_paths.h" |
21 #include "chrome/common/chrome_plugin_lib.h" | 22 #include "chrome/common/chrome_plugin_lib.h" |
22 #include "chrome/common/chrome_paths.h" | |
23 #include "chrome/common/chrome_switches.h" | 23 #include "chrome/common/chrome_switches.h" |
24 #include "chrome/common/default_plugin.h" | 24 #include "chrome/common/default_plugin.h" |
25 #include "chrome/common/extensions/extension.h" | 25 #include "chrome/common/extensions/extension.h" |
26 #include "chrome/common/logging_chrome.h" | 26 #include "chrome/common/logging_chrome.h" |
27 #include "chrome/common/notification_type.h" | |
28 #include "chrome/common/notification_service.h" | |
29 #include "chrome/common/pepper_plugin_registry.h" | 27 #include "chrome/common/pepper_plugin_registry.h" |
30 #include "chrome/common/plugin_messages.h" | 28 #include "chrome/common/plugin_messages.h" |
31 #include "chrome/common/render_messages.h" | 29 #include "chrome/common/render_messages.h" |
32 #include "content/browser/browser_thread.h" | 30 #include "content/browser/browser_thread.h" |
33 #include "content/browser/ppapi_plugin_process_host.h" | 31 #include "content/browser/ppapi_plugin_process_host.h" |
34 #include "content/browser/renderer_host/render_process_host.h" | 32 #include "content/browser/renderer_host/render_process_host.h" |
35 #include "content/browser/renderer_host/render_view_host.h" | 33 #include "content/browser/renderer_host/render_view_host.h" |
| 34 #include "content/common/notification_service.h" |
| 35 #include "content/common/notification_type.h" |
36 #include "webkit/plugins/npapi/plugin_constants_win.h" | 36 #include "webkit/plugins/npapi/plugin_constants_win.h" |
37 #include "webkit/plugins/npapi/plugin_list.h" | 37 #include "webkit/plugins/npapi/plugin_list.h" |
38 #include "webkit/plugins/npapi/webplugininfo.h" | 38 #include "webkit/plugins/npapi/webplugininfo.h" |
39 | 39 |
40 #if defined(OS_CHROMEOS) | 40 #if defined(OS_CHROMEOS) |
41 #include "chrome/browser/chromeos/plugin_selection_policy.h" | 41 #include "chrome/browser/chromeos/plugin_selection_policy.h" |
42 #endif | 42 #endif |
43 | 43 |
44 #if defined(OS_MACOSX) | 44 #if defined(OS_MACOSX) |
45 static void NotifyPluginsOfActivation() { | 45 static void NotifyPluginsOfActivation() { |
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
579 #if defined(OS_LINUX) | 579 #if defined(OS_LINUX) |
580 // static | 580 // static |
581 void PluginService::RegisterFilePathWatcher( | 581 void PluginService::RegisterFilePathWatcher( |
582 FilePathWatcher *watcher, | 582 FilePathWatcher *watcher, |
583 const FilePath& path, | 583 const FilePath& path, |
584 FilePathWatcher::Delegate* delegate) { | 584 FilePathWatcher::Delegate* delegate) { |
585 bool result = watcher->Watch(path, delegate); | 585 bool result = watcher->Watch(path, delegate); |
586 DCHECK(result); | 586 DCHECK(result); |
587 } | 587 } |
588 #endif | 588 #endif |
OLD | NEW |