Index: ui/gl/gl_implementation_win.cc |
diff --git a/ui/gl/gl_implementation_win.cc b/ui/gl/gl_implementation_win.cc |
index 7625b20e30bf8ca9b9083c4297c98edb36e94da5..007e976630d948403c7a2174ebdf6cc8b766c97b 100644 |
--- a/ui/gl/gl_implementation_win.cc |
+++ b/ui/gl/gl_implementation_win.cc |
@@ -16,6 +16,7 @@ |
#include "base/path_service.h" |
#include "base/stringprintf.h" |
#include "base/threading/thread_restrictions.h" |
+#include "base/utf_string_conversions.h" |
#include "ui/gl/gl_bindings.h" |
#include "ui/gl/gl_implementation.h" |
@@ -132,10 +133,10 @@ bool InitializeGLBindings(GLImplementation implementation) { |
// and if that fails, using an absolute path. This is to ensure these DLLs |
// are loaded before ANGLE is loaded in case they are not in the default |
// search path. |
- LoadD3DXLibrary(module_path, base::StringPrintf(L"d3dcompiler_%d.dll", |
- D3DX_SDK_VERSION)); |
- LoadD3DXLibrary(module_path, base::StringPrintf(L"d3dx9_%d.dll", |
- D3DX_SDK_VERSION)); |
+ LoadD3DXLibrary(module_path, ASCIIToWide( |
+ base::StringPrintf("d3dcompiler_%d.dll", D3DX_SDK_VERSION))); |
+ LoadD3DXLibrary(module_path, ASCIIToWide( |
+ base::StringPrintf("d3dx9_%d.dll", D3DX_SDK_VERSION))); |
FilePath gles_path; |
const CommandLine* command_line = CommandLine::ForCurrentProcess(); |