Turn on UIPI for the GPU sandbox.

GPU sandbox will start with UIPI by default. I had to move some switch values under ui/gfx/gl in order to avoid dependency hell.

BUG=90750
Review URL: http://codereview.chromium.org/7517012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94500 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 20 insertions, 12 deletions

diff --git a/ui/gfx/gl/gl_implementation.cc b/ui/gfx/gl/gl_implementation.cc
index 1856b75..21788c0 100644
--- a/ui/gfx/gl/gl_implementation.cc
+++ b/ui/gfx/gl/gl_implementation.cc
@@ -10,15 +10,9 @@
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "ui/gfx/gl/gl_switches.h"
 
 namespace gfx {
 
-const char kGLImplementationDesktopName[] = "desktop";
-const char kGLImplementationOSMesaName[]  = "osmesa";
-const char kGLImplementationEGLName[]     = "egl";
-const char kGLImplementationMockName[]    = "mock";
-
 namespace {
 
 const struct {
diff --git a/ui/gfx/gl/gl_implementation.h b/ui/gfx/gl/gl_implementation.h
index f357b31..c3e3ca4 100644
--- a/ui/gfx/gl/gl_implementation.h
+++ b/ui/gfx/gl/gl_implementation.h
@@ -10,6 +10,7 @@
 
 #include "base/native_library.h"
 #include "build/build_config.h"
+#include "ui/gfx/gl/gl_switches.h"
 
 namespace gfx {
 
@@ -22,12 +23,6 @@ enum GLImplementation {
   kGLImplementationMockGL
 };
 
-// The GL implementation names that can be passed to --use-gl.
-extern const char kGLImplementationDesktopName[];
-extern const char kGLImplementationOSMesaName[];
-extern const char kGLImplementationEGLName[];
-extern const char kGLImplementationMockName[];
-
 #if defined(OS_WIN)
 typedef void* (WINAPI *GLGetProcAddressProc)(const char* name);
 #else
diff --git a/ui/gfx/gl/gl_switches.cc b/ui/gfx/gl/gl_switches.cc
index 3fad5f3..b7aa18c 100644
--- a/ui/gfx/gl/gl_switches.cc
+++ b/ui/gfx/gl/gl_switches.cc
@@ -4,6 +4,15 @@
 
 #include "ui/gfx/gl/gl_switches.h"
 
+namespace gfx {
+
+const char kGLImplementationDesktopName[] = "desktop";
+const char kGLImplementationOSMesaName[]  = "osmesa";
+const char kGLImplementationEGLName[]     = "egl";
+const char kGLImplementationMockName[]    = "mock";
+
+}  // namespace gfx
+
 namespace switches {
 
 // Stop the GPU from synchronizing on the vsync before presenting.
diff --git a/ui/gfx/gl/gl_switches.h b/ui/gfx/gl/gl_switches.h
index 7cbf5ca..62f826e 100644
--- a/ui/gfx/gl/gl_switches.h
+++ b/ui/gfx/gl/gl_switches.h
@@ -8,6 +8,16 @@
 #define UI_GFX_GL_GL_SWITCHES_H_
 #pragma once
 
+namespace gfx {
+
+// The GL implementation names that can be passed to --use-gl.
+extern const char kGLImplementationDesktopName[];
+extern const char kGLImplementationOSMesaName[];
+extern const char kGLImplementationEGLName[];
+extern const char kGLImplementationMockName[];
+
+}  // namespace gfx
+
 namespace switches {
 
 extern const char kDisableGpuVsync[];