| 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/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "chrome/common/logging_chrome.h" | 23 #include "chrome/common/logging_chrome.h" |
| 24 #include "chrome/common/pepper_plugin_registry.h" | 24 #include "chrome/common/pepper_plugin_registry.h" |
| 25 #include "chrome/common/render_messages.h" | 25 #include "chrome/common/render_messages.h" |
| 26 #include "content/browser/browser_thread.h" | 26 #include "content/browser/browser_thread.h" |
| 27 #include "content/browser/ppapi_plugin_process_host.h" | 27 #include "content/browser/ppapi_plugin_process_host.h" |
| 28 #include "content/browser/renderer_host/render_process_host.h" | 28 #include "content/browser/renderer_host/render_process_host.h" |
| 29 #include "content/browser/renderer_host/render_view_host.h" | 29 #include "content/browser/renderer_host/render_view_host.h" |
| 30 #include "content/common/notification_service.h" | 30 #include "content/common/notification_service.h" |
| 31 #include "content/common/notification_type.h" | 31 #include "content/common/notification_type.h" |
| 32 #include "content/common/plugin_messages.h" | 32 #include "content/common/plugin_messages.h" |
| 33 #include "content/common/view_messages.h" |
| 33 #include "webkit/plugins/npapi/plugin_constants_win.h" | 34 #include "webkit/plugins/npapi/plugin_constants_win.h" |
| 34 #include "webkit/plugins/npapi/plugin_list.h" | 35 #include "webkit/plugins/npapi/plugin_list.h" |
| 35 #include "webkit/plugins/npapi/webplugininfo.h" | 36 #include "webkit/plugins/npapi/webplugininfo.h" |
| 36 | 37 |
| 37 #if defined(OS_CHROMEOS) | 38 #if defined(OS_CHROMEOS) |
| 38 #include "chrome/browser/chromeos/plugin_selection_policy.h" | 39 #include "chrome/browser/chromeos/plugin_selection_policy.h" |
| 39 #endif | 40 #endif |
| 40 | 41 |
| 41 #if defined(OS_LINUX) | 42 #if defined(OS_LINUX) |
| 42 using ::base::files::FilePathWatcher; | 43 using ::base::files::FilePathWatcher; |
| (...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 543 #if defined(OS_LINUX) | 544 #if defined(OS_LINUX) |
| 544 // static | 545 // static |
| 545 void PluginService::RegisterFilePathWatcher( | 546 void PluginService::RegisterFilePathWatcher( |
| 546 FilePathWatcher *watcher, | 547 FilePathWatcher *watcher, |
| 547 const FilePath& path, | 548 const FilePath& path, |
| 548 FilePathWatcher::Delegate* delegate) { | 549 FilePathWatcher::Delegate* delegate) { |
| 549 bool result = watcher->Watch(path, delegate); | 550 bool result = watcher->Watch(path, delegate); |
| 550 DCHECK(result); | 551 DCHECK(result); |
| 551 } | 552 } |
| 552 #endif | 553 #endif |
| OLD | NEW |