| 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 "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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 } | 279 } |
| 280 } | 280 } |
| 281 | 281 |
| 282 parsed_mime_types->push_back(mime_type); | 282 parsed_mime_types->push_back(mime_type); |
| 283 } | 283 } |
| 284 | 284 |
| 285 return true; | 285 return true; |
| 286 } | 286 } |
| 287 | 287 |
| 288 PluginList::PluginList() | 288 PluginList::PluginList() |
| 289 : loading_state_(LOADING_STATE_NEEDS_REFRESH) { | 289 : |
| 290 #if defined(OS_WIN) |
| 291 dont_load_new_wmp_(false), |
| 292 #endif |
| 293 loading_state_(LOADING_STATE_NEEDS_REFRESH) { |
| 290 PlatformInit(); | 294 PlatformInit(); |
| 291 AddHardcodedPluginGroups(kGroupDefinitions, | 295 AddHardcodedPluginGroups(kGroupDefinitions, |
| 292 ARRAYSIZE_UNSAFE(kGroupDefinitions)); | 296 ARRAYSIZE_UNSAFE(kGroupDefinitions)); |
| 293 } | 297 } |
| 294 | 298 |
| 295 // TODO(ibraaaa): DELETE and add a different one. http://crbug.com/124396 | 299 // TODO(ibraaaa): DELETE and add a different one. http://crbug.com/124396 |
| 296 PluginList::PluginList(const PluginGroupDefinition* definitions, | 300 PluginList::PluginList(const PluginGroupDefinition* definitions, |
| 297 size_t num_definitions) | 301 size_t num_definitions) |
| 298 : | 302 : |
| 299 #if defined(OS_WIN) | 303 #if defined(OS_WIN) |
| (...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 708 } | 712 } |
| 709 return did_remove; | 713 return did_remove; |
| 710 } | 714 } |
| 711 | 715 |
| 712 PluginList::~PluginList() { | 716 PluginList::~PluginList() { |
| 713 } | 717 } |
| 714 | 718 |
| 715 | 719 |
| 716 } // namespace npapi | 720 } // namespace npapi |
| 717 } // namespace webkit | 721 } // namespace webkit |
| OLD | NEW |