Move app/app_switches to ui/gfx/gl/gl_switches.

This is in preparation of moving app/gfx/gl to ui/gfx/gl.
All of the switches in app_switches are GL related.
Removed many includes that were unnecessary.

BUG=none
TEST=trybots

Review URL: http://codereview.chromium.org/6685089

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

5 files changed, 4 insertions, 44 deletions

diff --git a/app/app_base.gypi b/app/app_base.gypi
index 42253c5..372641d 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -29,8 +29,6 @@
             '../ui/base/ui_base_switches.cc',
             'app_paths.h',
             'app_paths.cc',
-            'app_switches.h',
-            'app_switches.cc',
         ],
         'conditions': [
           ['OS!="linux" and OS!="freebsd" and OS!="openbsd"', {
diff --git a/app/app_switches.cc b/app/app_switches.cc
deleted file mode 100644
index 59712bf..0000000
--- a/app/app_switches.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
-// source code is governed by a BSD-style license that can be found in the
-// LICENSE file.
-
-#include "app/app_switches.h"
-
-namespace switches {
-
-// Stop the GPU from synchronizing on the vsync before presenting.
-const char kDisableGpuVsync[]               = "disable-gpu-vsync";
-
-// Select which implementation of GL the GPU process should use. Options are:
-//  desktop: whatever desktop OpenGL the user has installed (Linux and Mac
-//           default).
-//  egl: whatever EGL / GLES2 the user has installed (Windows default - actually
-//       ANGLE).
-//  osmesa: The OSMesa software renderer.
-const char kUseGL[]                         = "use-gl";
-
-}  // namespace switches
diff --git a/app/app_switches.h b/app/app_switches.h
deleted file mode 100644
index f460cf7..0000000
--- a/app/app_switches.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Defines all the command-line switches used by app.
-
-#ifndef APP_APP_SWITCHES_H_
-#define APP_APP_SWITCHES_H_
-#pragma once
-
-namespace switches {
-
-extern const char kDisableGpuVsync[];
-extern const char kUseGL[];
-
-}  // namespace switches
-
-#endif  // APP_APP_SWITCHES_H_
diff --git a/app/gfx/gl/gl_context.cc b/app/gfx/gl/gl_context.cc
index 2020d46..ee33669 100644
--- a/app/gfx/gl/gl_context.cc
+++ b/app/gfx/gl/gl_context.cc
@@ -1,15 +1,15 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
-#include "app/app_switches.h"
 #include "app/gfx/gl/gl_context.h"
 #include "app/gfx/gl/gl_bindings.h"
 #include "app/gfx/gl/gl_implementation.h"
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "ui/gfx/gl/gl_switches.h"
 
 namespace gfx {
 
diff --git a/app/gfx/gl/gl_implementation.cc b/app/gfx/gl/gl_implementation.cc
index a56b6bb..be31fc5 100644
--- a/app/gfx/gl/gl_implementation.cc
+++ b/app/gfx/gl/gl_implementation.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,10 +7,10 @@
 #include <algorithm>
 #include <string>
 
-#include "app/app_switches.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "ui/gfx/gl/gl_switches.h"
 
 namespace gfx {