| 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 <tchar.h> | 5 #include <tchar.h> |
| 6 | 6 |
| 7 #include "webkit/glue/plugins/plugin_list.h" | 7 #include "webkit/glue/plugins/plugin_list.h" |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 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 !command_line.HasSwitch(kNoNativeActiveXShimSwitch); | 209 !command_line.HasSwitch(kNoNativeActiveXShimSwitch); |
| 210 | 210 |
| 211 const PluginVersionInfo builtin_plugins[] = { | 211 const PluginVersionInfo builtin_plugins[] = { |
| 212 { | 212 { |
| 213 FilePath(kActiveXShimFileNameForMediaPlayer), | 213 FilePath(kActiveXShimFileNameForMediaPlayer), |
| 214 kActiveXShimFileNameForMediaPlayer, | 214 kActiveXShimFileNameForMediaPlayer, |
| 215 L"Windows Media Player", | 215 L"Windows Media Player", |
| 216 L"1, 0, 0, 1", | 216 L"1, 0, 0, 1", |
| 217 L"application/x-ms-wmp|application/asx|video/x-ms-asf-plugin|" | 217 L"application/x-ms-wmp|application/asx|video/x-ms-asf-plugin|" |
| 218 L"application/x-mplayer2|video/x-ms-asf|video/x-ms-wm|audio/x-ms-wma|" | 218 L"application/x-mplayer2|video/x-ms-asf|video/x-ms-wm|audio/x-ms-wma|" |
| 219 L"audio/x-ms-wax|video/x-ms-wmv|video/x-ms-wvx", | 219 L"audio/x-ms-wax|video/x-ms-wmv|video/x-ms-wvx|audio/mpeg|video/mpeg", |
| 220 L"*|*|*|*|asf,asx,*|wm,*|wma,*|wax,*|wmv,*|wvx,*", | 220 L"*|*|*|*|asf,asx,*|wm,*|wma,*|wax,*|wmv,*|wvx,*|mp2,mp3,mpa,mpeg,mpg|" |
| 221 L"mpeg,mpg,m1v,mpe", |
| 221 L"", | 222 L"", |
| 222 { | 223 { |
| 223 activex_shim::ActiveX_Shim_NP_GetEntryPoints, | 224 activex_shim::ActiveX_Shim_NP_GetEntryPoints, |
| 224 activex_shim::ActiveX_Shim_NP_Initialize, | 225 activex_shim::ActiveX_Shim_NP_Initialize, |
| 225 activex_shim::ActiveX_Shim_NP_Shutdown | 226 activex_shim::ActiveX_Shim_NP_Shutdown |
| 226 } | 227 } |
| 227 }, | 228 }, |
| 228 #ifdef GEARS_STATIC_LIB | 229 #ifdef GEARS_STATIC_LIB |
| 229 { | 230 { |
| 230 FilePath(kGearsPluginLibraryName), | 231 FilePath(kGearsPluginLibraryName), |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 382 #endif | 383 #endif |
| 383 | 384 |
| 384 if (!use_internal_activex_shim_) | 385 if (!use_internal_activex_shim_) |
| 385 return; | 386 return; |
| 386 | 387 |
| 387 LoadPlugin(FilePath(kActiveXShimFileName)); | 388 LoadPlugin(FilePath(kActiveXShimFileName)); |
| 388 LoadPlugin(FilePath(kActiveXShimFileNameForMediaPlayer)); | 389 LoadPlugin(FilePath(kActiveXShimFileNameForMediaPlayer)); |
| 389 } | 390 } |
| 390 | 391 |
| 391 } // namespace NPAPI | 392 } // namespace NPAPI |
| OLD | NEW |