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 "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" |
(...skipping 23 matching lines...) Expand all Loading... |
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 |
43 | 43 |
| 44 using content::BrowserThread; |
44 using content::PluginServiceFilter; | 45 using content::PluginServiceFilter; |
45 | 46 |
46 namespace { | 47 namespace { |
47 | 48 |
48 // Helper function that merely runs the callback with the result. Called on the | 49 // Helper function that merely runs the callback with the result. Called on the |
49 // thread on which the original GetPlugins() call was made. | 50 // thread on which the original GetPlugins() call was made. |
50 static void RunGetPluginsCallback( | 51 static void RunGetPluginsCallback( |
51 const PluginService::GetPluginsCallback& callback, | 52 const PluginService::GetPluginsCallback& callback, |
52 const std::vector<webkit::WebPluginInfo>& result) { | 53 const std::vector<webkit::WebPluginInfo>& result) { |
53 callback.Run(result); | 54 callback.Run(result); |
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
616 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 617 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
617 // static | 618 // static |
618 void PluginService::RegisterFilePathWatcher( | 619 void PluginService::RegisterFilePathWatcher( |
619 FilePathWatcher *watcher, | 620 FilePathWatcher *watcher, |
620 const FilePath& path, | 621 const FilePath& path, |
621 FilePathWatcher::Delegate* delegate) { | 622 FilePathWatcher::Delegate* delegate) { |
622 bool result = watcher->Watch(path, delegate); | 623 bool result = watcher->Watch(path, delegate); |
623 DCHECK(result); | 624 DCHECK(result); |
624 } | 625 } |
625 #endif | 626 #endif |
OLD | NEW |