| 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/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 786 const webkit::WebPluginInfo& info, | 786 const webkit::WebPluginInfo& info, |
| 787 bool add_at_beginning) { | 787 bool add_at_beginning) { |
| 788 plugin_list_->RegisterInternalPlugin(info, add_at_beginning); | 788 plugin_list_->RegisterInternalPlugin(info, add_at_beginning); |
| 789 } | 789 } |
| 790 | 790 |
| 791 void PluginServiceImpl::GetInternalPlugins( | 791 void PluginServiceImpl::GetInternalPlugins( |
| 792 std::vector<webkit::WebPluginInfo>* plugins) { | 792 std::vector<webkit::WebPluginInfo>* plugins) { |
| 793 plugin_list_->GetInternalPlugins(plugins); | 793 plugin_list_->GetInternalPlugins(plugins); |
| 794 } | 794 } |
| 795 | 795 |
| 796 webkit::npapi::PluginList* PluginServiceImpl::GetPluginList() { | |
| 797 return plugin_list_; | |
| 798 } | |
| 799 | |
| 800 } // namespace content | 796 } // namespace content |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 19518006:
Remove the two years old code to enable the nacl plugin once if it's disabled. This was added to de… (Closed)
Base URL: svn://chrome-svn/chrome/trunk/src/