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

Unified Diff: ui/gl/gl_implementation_win.cc

Issue 10449042: Remove wchar/wstring version of StringPrintf. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
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();
« base/stringprintf.cc ('K') | « content/browser/geolocation/wifi_data_provider_common_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698