webkit/plugins/npapi/plugin_list_win.cc - Issue 6246036: FilePath: Remove most of ToWStringHack, adding a LossyDisplayName()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/plugins/npapi/plugin_list_win.cc

Issue 6246036: FilePath: Remove most of ToWStringHack, adding a LossyDisplayName() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: bug link Created 9 years, 11 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:

Index: webkit/plugins/npapi/plugin_list_win.cc

diff --git a/webkit/plugins/npapi/plugin_list_win.cc b/webkit/plugins/npapi/plugin_list_win.cc

index eaa64a7e1e007ddaee90ea9357002b2ef05eddd4..22eb670fe82af6f35c11afe606f96f693f2eccb8 100644

--- a/webkit/plugins/npapi/plugin_list_win.cc

+++ b/webkit/plugins/npapi/plugin_list_win.cc

@@ -343,9 +343,9 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,

(*plugin_groups)[i]->web_plugins_info();

for (size_t j = 0; j < plugins.size(); ++j) {

std::wstring plugin1 =

- StringToLowerASCII(plugins[j].path.BaseName().ToWStringHack());

+ StringToLowerASCII(plugins[j].path.BaseName().value());

std::wstring plugin2 =

- StringToLowerASCII(info.path.BaseName().ToWStringHack());

+ StringToLowerASCII(info.path.BaseName().value());

if ((plugin1 == plugin2 && HaveSharedMimeType(plugins[j], info)) ||

(plugin1 == kJavaDeploy1 && plugin2 == kJavaDeploy2) ||

(plugin1 == kJavaDeploy2 && plugin2 == kJavaDeploy1)) {

« no previous file with comments | « views/drag_utils.cc ('k') | no next file » | no next file with comments »