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

Side by Side Diff: webkit/plugins/npapi/plugin_lib_win.cc

Issue 5968008: Update file version info/memory details/process utils to use string16.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years 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 | « net/test/test_server_posix.cc ('k') | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_lib.h" 5 #include "webkit/plugins/npapi/plugin_lib.h"
6 6
7 #include "base/file_version_info.h" 7 #include "base/file_version_info.h"
8 #include "base/file_version_info_win.h" 8 #include "base/file_version_info_win.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "webkit/plugins/npapi/plugin_constants_win.h" 11 #include "webkit/plugins/npapi/plugin_constants_win.h"
12 #include "webkit/plugins/npapi/plugin_list.h" 12 #include "webkit/plugins/npapi/plugin_list.h"
13 13
14 namespace webkit { 14 namespace webkit {
15 namespace npapi { 15 namespace npapi {
16 16
17 bool PluginLib::ReadWebPluginInfo(const FilePath &filename, 17 bool PluginLib::ReadWebPluginInfo(const FilePath &filename,
18 WebPluginInfo* info) { 18 WebPluginInfo* info) {
19 // On windows, the way we get the mime types for the library is 19 // On windows, the way we get the mime types for the library is
20 // to check the version information in the DLL itself. This 20 // to check the version information in the DLL itself. This
21 // will be a string of the format: <type1>|<type2>|<type3>|... 21 // will be a string of the format: <type1>|<type2>|<type3>|...
22 // For example: 22 // For example:
23 // video/quicktime|audio/aiff|image/jpeg 23 // video/quicktime|audio/aiff|image/jpeg
24 scoped_ptr<FileVersionInfo> version_info( 24 scoped_ptr<FileVersionInfo> version_info(
25 FileVersionInfo::CreateFileVersionInfo(filename.value())); 25 FileVersionInfo::CreateFileVersionInfo(filename));
26 if (!version_info.get()) { 26 if (!version_info.get()) {
27 LOG_IF(ERROR, PluginList::DebugPluginLoading()) 27 LOG_IF(ERROR, PluginList::DebugPluginLoading())
28 << "Could not get version info for plugin " 28 << "Could not get version info for plugin "
29 << filename.value(); 29 << filename.value();
30 return false; 30 return false;
31 } 31 }
32 32
33 FileVersionInfoWin* version_info_win = 33 FileVersionInfoWin* version_info_win =
34 static_cast<FileVersionInfoWin*>(version_info.get()); 34 static_cast<FileVersionInfoWin*>(version_info.get());
35 PluginVersionInfo pvi; 35 PluginVersionInfo pvi;
36 pvi.mime_types = version_info_win->GetStringValue(L"MIMEType"); 36 pvi.mime_types = version_info_win->GetStringValue(L"MIMEType");
37 pvi.file_extensions = version_info_win->GetStringValue(L"FileExtents"); 37 pvi.file_extensions = version_info_win->GetStringValue(L"FileExtents");
38 pvi.type_descriptions = version_info_win->GetStringValue(L"FileOpenName"); 38 pvi.type_descriptions = version_info_win->GetStringValue(L"FileOpenName");
39 pvi.product_name = version_info->product_name(); 39 pvi.product_name = version_info->product_name();
40 pvi.file_description = version_info->file_description(); 40 pvi.file_description = version_info->file_description();
41 pvi.file_version = version_info->file_version(); 41 pvi.file_version = version_info->file_version();
42 pvi.path = filename; 42 pvi.path = filename;
43 43
44 return PluginList::CreateWebPluginInfo(pvi, info); 44 return PluginList::CreateWebPluginInfo(pvi, info);
45 } 45 }
46 46
47 } // namespace npapi 47 } // namespace npapi
48 } // namespace webkit 48 } // namespace webkit
OLDNEW
« no previous file with comments | « net/test/test_server_posix.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698