| 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 "webkit/plugins/npapi/plugin_list.h" | 5 #include "webkit/plugins/npapi/plugin_list.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
| (...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 PlatformInit(); | 334 PlatformInit(); |
| 335 AddHardcodedPluginGroups(&plugin_groups_); | 335 AddHardcodedPluginGroups(&plugin_groups_); |
| 336 } | 336 } |
| 337 | 337 |
| 338 PluginList::PluginList(const PluginGroupDefinition* definitions, | 338 PluginList::PluginList(const PluginGroupDefinition* definitions, |
| 339 size_t num_definitions) | 339 size_t num_definitions) |
| 340 : plugins_loaded_(false), | 340 : plugins_loaded_(false), |
| 341 plugins_need_refresh_(false), | 341 plugins_need_refresh_(false), |
| 342 disable_outdated_plugins_(false), | 342 disable_outdated_plugins_(false), |
| 343 group_definitions_(definitions), | 343 group_definitions_(definitions), |
| 344 num_group_definitions_(num_definitions) { | 344 num_group_definitions_(num_definitions), |
| 345 default_plugin_enabled_(false) { |
| 345 // Don't do platform-dependend initialization in unit tests. | 346 // Don't do platform-dependend initialization in unit tests. |
| 346 AddHardcodedPluginGroups(&plugin_groups_); | 347 AddHardcodedPluginGroups(&plugin_groups_); |
| 347 } | 348 } |
| 348 | 349 |
| 349 void PluginList::LoadPluginsInternal(ScopedVector<PluginGroup>* plugin_groups) { | 350 void PluginList::LoadPluginsInternal(ScopedVector<PluginGroup>* plugin_groups) { |
| 350 // Don't want to hold the lock while loading new plugins, so we don't block | 351 // Don't want to hold the lock while loading new plugins, so we don't block |
| 351 // other methods if they're called on other threads. | 352 // other methods if they're called on other threads. |
| 352 std::vector<FilePath> extra_plugin_paths; | 353 std::vector<FilePath> extra_plugin_paths; |
| 353 std::vector<FilePath> extra_plugin_dirs; | 354 std::vector<FilePath> extra_plugin_dirs; |
| 354 std::vector<InternalPlugin> internal_plugins; | 355 std::vector<InternalPlugin> internal_plugins; |
| (...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 834 void PluginList::DisableOutdatedPluginGroups() { | 835 void PluginList::DisableOutdatedPluginGroups() { |
| 835 disable_outdated_plugins_ = true; | 836 disable_outdated_plugins_ = true; |
| 836 } | 837 } |
| 837 | 838 |
| 838 PluginList::~PluginList() { | 839 PluginList::~PluginList() { |
| 839 } | 840 } |
| 840 | 841 |
| 841 | 842 |
| 842 } // namespace npapi | 843 } // namespace npapi |
| 843 } // namespace webkit | 844 } // namespace webkit |
| OLD | NEW |