OLD | NEW |
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_service_impl.h" | 5 #include "content/browser/plugin_service_impl.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 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
593 ppapi_plugins_.push_back(new_pepper_info); | 593 ppapi_plugins_.push_back(new_pepper_info); |
594 return &ppapi_plugins_[ppapi_plugins_.size() - 1]; | 594 return &ppapi_plugins_[ppapi_plugins_.size() - 1]; |
595 } | 595 } |
596 | 596 |
597 #if defined(OS_POSIX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID) | 597 #if defined(OS_POSIX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID) |
598 // static | 598 // static |
599 void PluginServiceImpl::RegisterFilePathWatcher( | 599 void PluginServiceImpl::RegisterFilePathWatcher( |
600 FilePathWatcher* watcher, | 600 FilePathWatcher* watcher, |
601 const FilePath& path, | 601 const FilePath& path, |
602 FilePathWatcher::Delegate* delegate) { | 602 FilePathWatcher::Delegate* delegate) { |
603 bool result = watcher->Watch(path, delegate); | 603 bool result = watcher->Watch(path, false, delegate); |
604 DCHECK(result); | 604 DCHECK(result); |
605 } | 605 } |
606 #endif | 606 #endif |
607 | 607 |
608 void PluginServiceImpl::SetFilter(PluginServiceFilter* filter) { | 608 void PluginServiceImpl::SetFilter(PluginServiceFilter* filter) { |
609 filter_ = filter; | 609 filter_ = filter; |
610 } | 610 } |
611 | 611 |
612 PluginServiceFilter* PluginServiceImpl::GetFilter() { | 612 PluginServiceFilter* PluginServiceImpl::GetFilter() { |
613 return filter_; | 613 return filter_; |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
703 void PluginServiceImpl::GetInternalPlugins( | 703 void PluginServiceImpl::GetInternalPlugins( |
704 std::vector<webkit::WebPluginInfo>* plugins) { | 704 std::vector<webkit::WebPluginInfo>* plugins) { |
705 plugin_list_->GetInternalPlugins(plugins); | 705 plugin_list_->GetInternalPlugins(plugins); |
706 } | 706 } |
707 | 707 |
708 webkit::npapi::PluginList* PluginServiceImpl::GetPluginList() { | 708 webkit::npapi::PluginList* PluginServiceImpl::GetPluginList() { |
709 return plugin_list_; | 709 return plugin_list_; |
710 } | 710 } |
711 | 711 |
712 } // namespace content | 712 } // namespace content |
OLD | NEW |