Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(856)

Side by Side Diff: webkit/glue/plugins/plugin_lib.cc

Issue 7272: This fixes a regression introduced by my fix for http://code.google.com/p/chr... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "config.h" 5 #include "config.h"
6 6
7 #include "webkit/glue/plugins/plugin_lib.h" 7 #include "webkit/glue/plugins/plugin_lib.h"
8 8
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/file_version_info.h" 10 #include "base/file_version_info.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 }; 60 };
61 61
62 static const InternalPluginInfo activex_shim_windows_media_player = { 62 static const InternalPluginInfo activex_shim_windows_media_player = {
63 {kActivexShimFileNameForMediaPlayer, 63 {kActivexShimFileNameForMediaPlayer,
64 kActivexShimFileNameForMediaPlayer, 64 kActivexShimFileNameForMediaPlayer,
65 L"Windows Media Player", 65 L"Windows Media Player",
66 L"1, 0, 0, 1", 66 L"1, 0, 0, 1",
67 L"application/x-ms-wmp|application/asx|video/x-ms-asf-plugin|" 67 L"application/x-ms-wmp|application/asx|video/x-ms-asf-plugin|"
68 L"application/x-mplayer2|video/x-ms-asf|video/x-ms-wm|audio/x-ms-wma|" 68 L"application/x-mplayer2|video/x-ms-asf|video/x-ms-wm|audio/x-ms-wma|"
69 L"audio/x-ms-wax|video/x-ms-wmv|video/x-ms-wvx", 69 L"audio/x-ms-wax|video/x-ms-wmv|video/x-ms-wvx",
70 L"*|*|*|*|*|*|asf,asx,*|wm,*|wma,*|wax,*|wmv,*|wvx,*", 70 L"*|*|*|*|asf,asx,*|wm,*|wma,*|wax,*|wmv,*|wvx,*",
71 L"" 71 L""
72 }, 72 },
73 activex_shim::ActiveX_Shim_NP_GetEntryPoints, 73 activex_shim::ActiveX_Shim_NP_GetEntryPoints,
74 activex_shim::ActiveX_Shim_NP_Initialize, 74 activex_shim::ActiveX_Shim_NP_Initialize,
75 activex_shim::ActiveX_Shim_NP_Shutdown 75 activex_shim::ActiveX_Shim_NP_Shutdown
76 }; 76 };
77 77
78 static const InternalPluginInfo default_null_plugin_info = { 78 static const InternalPluginInfo default_null_plugin_info = {
79 {kDefaultPluginDllName, 79 {kDefaultPluginDllName,
80 L"Default Plug-in", 80 L"Default Plug-in",
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 pvi.product_name = version_info->product_name(); 418 pvi.product_name = version_info->product_name();
419 pvi.file_description = version_info->file_description(); 419 pvi.file_description = version_info->file_description();
420 pvi.file_version = version_info->file_version(); 420 pvi.file_version = version_info->file_version();
421 pvi.file_name = filename; 421 pvi.file_name = filename;
422 422
423 return CreateWebPluginInfo(pvi); 423 return CreateWebPluginInfo(pvi);
424 } 424 }
425 425
426 } // namespace NPAPI 426 } // namespace NPAPI
427 427
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698