| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 <algorithm> | 5 #include <algorithm> |
| 6 #include <tchar.h> | 6 #include <tchar.h> |
| 7 | 7 |
| 8 #include "webkit/glue/plugins/plugin_list.h" | 8 #include "webkit/glue/plugins/plugin_list.h" |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 } | 209 } |
| 210 | 210 |
| 211 return true; | 211 return true; |
| 212 } | 212 } |
| 213 | 213 |
| 214 void PluginList::LoadInternalPlugins() { | 214 void PluginList::LoadInternalPlugins() { |
| 215 if (use_internal_activex_shim_) { | 215 if (use_internal_activex_shim_) { |
| 216 scoped_refptr<PluginLib> new_plugin = PluginLib::CreatePluginLib( | 216 scoped_refptr<PluginLib> new_plugin = PluginLib::CreatePluginLib( |
| 217 kActiveXShimFileName); | 217 kActiveXShimFileName); |
| 218 plugins_.push_back(new_plugin); | 218 plugins_.push_back(new_plugin); |
| 219 |
| 220 new_plugin = PluginLib::CreatePluginLib( |
| 221 kActivexShimFileNameForMediaPlayer); |
| 222 plugins_.push_back(new_plugin); |
| 219 } | 223 } |
| 220 } | 224 } |
| 221 | 225 |
| 222 int PluginList::FindPluginFile(const std::wstring& filename) { | 226 int PluginList::FindPluginFile(const std::wstring& filename) { |
| 223 for (size_t i = 0; i < plugins_.size(); ++i) { | 227 for (size_t i = 0; i < plugins_.size(); ++i) { |
| 224 if (file_util::GetFilenameFromPath(plugins_[i]->plugin_info().file) == | 228 if (file_util::GetFilenameFromPath(plugins_[i]->plugin_info().file) == |
| 225 filename) { | 229 filename) { |
| 226 return static_cast<int>(i); | 230 return static_cast<int>(i); |
| 227 } | 231 } |
| 228 } | 232 } |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 470 RegKey key(root_key, reg_path.c_str()); | 474 RegKey key(root_key, reg_path.c_str()); |
| 471 | 475 |
| 472 std::wstring path; | 476 std::wstring path; |
| 473 if (key.ReadValue(kRegistryPath, &path)) | 477 if (key.ReadValue(kRegistryPath, &path)) |
| 474 LoadPlugin(path); | 478 LoadPlugin(path); |
| 475 } | 479 } |
| 476 } | 480 } |
| 477 | 481 |
| 478 } // namespace NPAPI | 482 } // namespace NPAPI |
| 479 | 483 |
| OLD | NEW |