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

Unified Diff: ui/gl/gl_implementation_win.cc

Issue 12217101: Replace FilePath with base::FilePath in some more top level directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
« no previous file with comments | « ui/gl/gl_implementation_mac.cc ('k') | ui/metro_viewer/metro_viewer_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_implementation_win.cc
diff --git a/ui/gl/gl_implementation_win.cc b/ui/gl/gl_implementation_win.cc
index fa442b7046868a28a7d1e50122fb34f77d4b32b0..22fcd777117a40c634be3da4f8c53b1d08dc1aa5 100644
--- a/ui/gl/gl_implementation_win.cc
+++ b/ui/gl/gl_implementation_win.cc
@@ -44,9 +44,10 @@ void GL_BINDING_CALL MarshalDepthRangeToDepthRangef(GLclampd z_near,
glDepthRangef(static_cast<GLclampf>(z_near), static_cast<GLclampf>(z_far));
}
-bool LoadD3DXLibrary(const FilePath& module_path,
- const FilePath::StringType& name) {
- base::NativeLibrary library = base::LoadNativeLibrary(FilePath(name), NULL);
+bool LoadD3DXLibrary(const base::FilePath& module_path,
+ const base::FilePath::StringType& name) {
+ base::NativeLibrary library =
+ base::LoadNativeLibrary(base::FilePath(name), NULL);
if (!library) {
library = base::LoadNativeLibrary(module_path.Append(name), NULL);
if (!library) {
@@ -80,7 +81,7 @@ bool InitializeGLBindings(GLImplementation implementation) {
switch (implementation) {
case kGLImplementationOSMesaGL: {
- FilePath module_path;
+ base::FilePath module_path;
if (!PathService::Get(base::DIR_MODULE, &module_path)) {
LOG(ERROR) << "PathService::Get failed.";
return false;
@@ -112,7 +113,7 @@ bool InitializeGLBindings(GLImplementation implementation) {
break;
}
case kGLImplementationEGLGLES2: {
- FilePath module_path;
+ base::FilePath module_path;
if (!PathService::Get(base::DIR_MODULE, &module_path))
return false;
@@ -125,7 +126,7 @@ bool InitializeGLBindings(GLImplementation implementation) {
LoadD3DXLibrary(module_path, kPreVistaD3DCompiler);
}
- FilePath gles_path;
+ base::FilePath gles_path;
const CommandLine* command_line = CommandLine::ForCurrentProcess();
bool using_swift_shader =
command_line->GetSwitchValueASCII(switches::kUseGL) == "swiftshader";
@@ -195,7 +196,7 @@ bool InitializeGLBindings(GLImplementation implementation) {
// When using Windows OpenGL, first try wglGetProcAddress and then
// Windows GetProcAddress.
base::NativeLibrary library = base::LoadNativeLibrary(
- FilePath(L"opengl32.dll"), NULL);
+ base::FilePath(L"opengl32.dll"), NULL);
if (!library) {
DVLOG(1) << "opengl32.dll not found";
return false;
« no previous file with comments | « ui/gl/gl_implementation_mac.cc ('k') | ui/metro_viewer/metro_viewer_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698