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

Unified Diff: ui/gl/gl_surface.cc

Issue 819223002: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gl/gl_implementation_x11.cc ('k') | ui/gl/gl_surface_egl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_surface.cc
diff --git a/ui/gl/gl_surface.cc b/ui/gl/gl_surface.cc
index 3de560bbca4bdb97ec57d653c46e2ae833b518c7..aaf12acbedda9014ad1f6b8adaf56da7eccd86b0 100644
--- a/ui/gl/gl_surface.cc
+++ b/ui/gl/gl_surface.cc
@@ -37,7 +37,7 @@ bool GLSurface::InitializeOneOff() {
GetAllowedGLImplementations(&allowed_impls);
DCHECK(!allowed_impls.empty());
- CommandLine* cmd = CommandLine::ForCurrentProcess();
+ base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
// The default implementation is always the first one in list.
GLImplementation impl = allowed_impls[0];
@@ -108,7 +108,8 @@ void GLSurface::InitializeOneOffForTests() {
// We usually use OSMesa as this works on all bots. The command line can
// override this behaviour to use hardware GL.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseGpuInTests))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kUseGpuInTests))
use_osmesa = false;
#if defined(OS_ANDROID)
@@ -124,7 +125,7 @@ void GLSurface::InitializeOneOffForTests() {
if (use_osmesa)
impl = kGLImplementationOSMesaGL;
- DCHECK(!CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseGL))
+ DCHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseGL))
<< "kUseGL has not effect in tests";
bool fallback_to_osmesa = false;
@@ -137,7 +138,7 @@ void GLSurface::InitializeOneOffForTests() {
// static
void GLSurface::InitializeOneOffWithMockBindingsForTests() {
- DCHECK(!CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseGL))
+ DCHECK(!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseGL))
<< "kUseGL has not effect in tests";
// This method may be called multiple times in the same process to set up
« no previous file with comments | « ui/gl/gl_implementation_x11.cc ('k') | ui/gl/gl_surface_egl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698