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

29 files changed, 37 insertions, 49 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/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 {
 
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc
index ee6cc6b..4672587 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -5,7 +5,6 @@
 #include "chrome/app/chrome_main.h"
 
 #include "app/app_paths.h"
-#include "app/app_switches.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
diff --git a/chrome/browser/browser_main_mac.mm b/chrome/browser/browser_main_mac.mm
index 5bee90a..635ba42 100644
--- a/chrome/browser/browser_main_mac.mm
+++ b/chrome/browser/browser_main_mac.mm
@@ -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.
 
@@ -6,7 +6,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "app/app_switches.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/file_path.h"
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
index 04fb5c5..7f0a353 100644
--- a/chrome/browser/chromeos/login/login_utils.cc
+++ b/chrome/browser/chromeos/login/login_utils.cc
@@ -6,7 +6,6 @@
 
 #include <vector>
 
-#include "app/app_switches.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ -58,6 +57,7 @@
 #include "net/proxy/proxy_config_service.h"
 #include "net/url_request/url_request_context.h"
 #include "views/widget/widget_gtk.h"
+#include "ui/gfx/gl/gl_switches.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/first_run/first_run_gtk.cc b/chrome/browser/first_run/first_run_gtk.cc
index a29ed26..913444c 100644
--- a/chrome/browser/first_run/first_run_gtk.cc
+++ b/chrome/browser/first_run/first_run_gtk.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/first_run/first_run.h"
 
-#include "app/app_switches.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
diff --git a/chrome/browser/gpu_data_manager.cc b/chrome/browser/gpu_data_manager.cc
index 576ed4b..d62434a 100644
--- a/chrome/browser/gpu_data_manager.cc
+++ b/chrome/browser/gpu_data_manager.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/gpu_data_manager.h"
 
-#include "app/app_switches.h"
 #include "app/gfx/gl/gl_implementation.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ -19,6 +18,7 @@
 #include "content/gpu/gpu_info_collector.h"
 #include "grit/browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/gl/gl_switches.h"
 
 GpuDataManager::GpuDataManager()
     : complete_gpu_info_already_requested_(false),
diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc
index 97e0d39..4bdf7c4 100644
--- a/chrome/browser/prefs/command_line_pref_store.cc
+++ b/chrome/browser/prefs/command_line_pref_store.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/prefs/command_line_pref_store.h"
 
-#include "app/app_switches.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
diff --git a/chrome/browser/prefs/command_line_pref_store_unittest.cc b/chrome/browser/prefs/command_line_pref_store_unittest.cc
index edc88d9..28c35d19 100644
--- a/chrome/browser/prefs/command_line_pref_store_unittest.cc
+++ b/chrome/browser/prefs/command_line_pref_store_unittest.cc
@@ -4,7 +4,6 @@
 
 #include <gtest/gtest.h>
 
-#include "app/app_switches.h"
 #include "base/command_line.h"
 #include "base/ref_counted.h"
 #include "base/string_util.h"
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index d0ae0a4..34956bc 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -15,7 +15,6 @@
 #include <utility>  // for pair<>
 #endif
 
-#include "app/app_switches.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ -102,6 +101,7 @@
 #include "ipc/ipc_switches.h"
 #include "media/base/media_switches.h"
 #include "ui/base/ui_base_switches.h"
+#include "ui/gfx/gl/gl_switches.h"
 #include "webkit/fileapi/file_system_path_manager.h"
 #include "webkit/glue/resource_type.h"
 #include "webkit/plugins/plugin_switches.h"
diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
index ff66a62..ab57067 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
@@ -6,7 +6,6 @@
 
 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h"
 
-#include "app/app_switches.h"
 #include "app/surface/io_surface_support_mac.h"
 #include "base/command_line.h"
 #include "base/logging.h"
@@ -42,6 +41,7 @@
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebInputEventFactory.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
+#include "ui/gfx/gl/gl_switches.h"
 #include "webkit/glue/webaccessibility.h"
 #include "webkit/plugins/npapi/webplugin.h"
 
diff --git a/chrome/browser/utility_process_host.cc b/chrome/browser/utility_process_host.cc
index 9f0d37f..0ad3150e 100644
--- a/chrome/browser/utility_process_host.cc
+++ b/chrome/browser/utility_process_host.cc
@@ -1,10 +1,9 @@
-// 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 "chrome/browser/utility_process_host.h"
 
-#include "app/app_switches.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 894aad6..178300c 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -16,9 +16,9 @@
 namespace switches {
 
 // -----------------------------------------------------------------------------
-// Can't find the switch you are looking for? Try looking in app/app_switches.cc
-// or base/base_switches.cc or content/common/content_switches.cc or
-// media/base/media_switches.cc instead.
+// Can't find the switch you are looking for? Try looking in
+// ui/gfx/gl/gl_switches.cc or base/base_switches.cc or
+// content/common/content_switches.cc or media/base/media_switches.cc instead.
 // -----------------------------------------------------------------------------
 
 // All switches in alphabetical order. The switches should be documented
diff --git a/chrome/common/common_glue.cc b/chrome/common/common_glue.cc
index 09bbbfe..d02a9c8 100644
--- a/chrome/common/common_glue.cc
+++ b/chrome/common/common_glue.cc
@@ -1,8 +1,7 @@
-// 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.
 
-#include "app/app_switches.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/string16.h"
diff --git a/chrome/renderer/devtools_client.cc b/chrome/renderer/devtools_client.cc
index 4352098..e77fe66 100644
--- a/chrome/renderer/devtools_client.cc
+++ b/chrome/renderer/devtools_client.cc
@@ -1,10 +1,9 @@
-// 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 "chrome/renderer/devtools_client.h"
 
-#include "app/app_switches.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/service/service_utility_process_host.cc b/chrome/service/service_utility_process_host.cc
index b0a0add..31f8b0e 100644
--- a/chrome/service/service_utility_process_host.cc
+++ b/chrome/service/service_utility_process_host.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/service/service_utility_process_host.h"
 
-#include "app/app_switches.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index 7b34f3a..e2b5c7a 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -4,7 +4,6 @@
 
 #include <string>
 
-#include "app/app_switches.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc
index 0808c2c..1afa3a6 100644
--- a/chrome/test/gpu/gpu_pixel_browsertest.cc
+++ b/chrome/test/gpu/gpu_pixel_browsertest.cc
@@ -1,11 +1,10 @@
-// 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.
 
 #include <string>
 #include <vector>
 
-#include "app/app_switches.h"
 #include "app/gfx/gl/gl_implementation.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ -32,6 +31,7 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/gl/gl_switches.h"
 #include "ui/gfx/size.h"
 
 namespace {
diff --git a/chrome/test/test_launcher_utils.cc b/chrome/test/test_launcher_utils.cc
index 237b9c6..1d37a13 100644
--- a/chrome/test/test_launcher_utils.cc
+++ b/chrome/test/test_launcher_utils.cc
@@ -1,8 +1,7 @@
-// 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.
 
-#include "app/app_switches.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/logging.h"
@@ -12,6 +11,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/test_launcher_utils.h"
+#include "ui/gfx/gl/gl_switches.h"
 
 namespace {
 
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 83c41f4..98e6bec 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -12,7 +12,6 @@
 #include <set>
 #include <vector>
 
-#include "app/app_switches.h"
 #include "app/gfx/gl/gl_implementation.h"
 #include "app/sql/connection.h"
 #include "base/base_switches.h"
@@ -51,6 +50,7 @@
 #include "content/common/debug_flags.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
+#include "ui/gfx/gl/gl_switches.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
diff --git a/chrome/utility/utility_main.cc b/chrome/utility/utility_main.cc
index ccf3bd5..f18368b 100644
--- a/chrome/utility/utility_main.cc
+++ b/chrome/utility/utility_main.cc
@@ -1,8 +1,7 @@
-// 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.
 
-#include "app/app_switches.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index fd44081..c3e101b 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -4,7 +4,6 @@
 
 #include "chrome_frame/chrome_frame_automation.h"
 
-#include "app/app_switches.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
diff --git a/content/browser/gpu_process_host.cc b/content/browser/gpu_process_host.cc
index 5d3ff65..91da8a4 100644
--- a/content/browser/gpu_process_host.cc
+++ b/content/browser/gpu_process_host.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.
 
@@ -8,7 +8,6 @@
 
 #include "content/browser/gpu_process_host.h"
 
-#include "app/app_switches.h"
 #include "base/metrics/histogram.h"
 #include "base/ref_counted.h"
 #include "base/string_piece.h"
@@ -25,6 +24,7 @@
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_switches.h"
 #include "media/base/media_switches.h"
+#include "ui/gfx/gl/gl_switches.h"
 
 #if defined(OS_LINUX)
 #include "ui/gfx/gtk_native_view_id_manager.h"
diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc
index ec121c0..e9fdf56 100644
--- a/content/browser/plugin_process_host.cc
+++ b/content/browser/plugin_process_host.cc
@@ -12,7 +12,6 @@
 
 #include <vector>
 
-#include "app/app_switches.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ -43,6 +42,7 @@
 #include "net/url_request/url_request_context.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/native_widget_types.h"
+#include "ui/gfx/gl/gl_switches.h"
 
 #if defined(USE_X11)
 #include "ui/gfx/gtk_native_view_id_manager.h"
diff --git a/app/app_switches.cc b/ui/gfx/gl/gl_switches.cc
index 59712bf..b11075d 100644
--- a/app/app_switches.cc
+++ b/ui/gfx/gl/gl_switches.cc
@@ -1,8 +1,8 @@
-// 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.
+// 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 "app/app_switches.h"
+#include "ui/gfx/gl/gl_switches.h"
 
 namespace switches {
 
diff --git a/app/app_switches.h b/ui/gfx/gl/gl_switches.h
index f460cf7..b910fe9 100644
--- a/app/app_switches.h
+++ b/ui/gfx/gl/gl_switches.h
@@ -1,11 +1,11 @@
-// 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.
 
-// Defines all the command-line switches used by app.
+// Defines all the command-line switches used by ui/gfx/gl.
 
-#ifndef APP_APP_SWITCHES_H_
-#define APP_APP_SWITCHES_H_
+#ifndef UI_GFX_GL_GL_SWITCHES_H_
+#define UI_GFX_GL_GL_SWITCHES_H_
 #pragma once
 
 namespace switches {
@@ -15,4 +15,4 @@ extern const char kUseGL[];
 
 }  // namespace switches
 
-#endif  // APP_APP_SWITCHES_H_
+#endif  // UI_GFX_GL_GL_SWITCHES_H_
diff --git a/ui/ui_gfx.gypi b/ui/ui_gfx.gypi
index 9d27543..d3c36d3 100644
--- a/ui/ui_gfx.gypi
+++ b/ui/ui_gfx.gypi
@@ -81,6 +81,8 @@
         'gfx/gfx_paths.h',
         'gfx/gfx_module.cc',
         'gfx/gfx_module.h',
+        'gfx/gl/gl_switches.cc',
+        'gfx/gl/gl_switches.h',
         'gfx/image.cc',
         'gfx/image.h',
         'gfx/image_mac.mm',
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 3feef80..2a6917d 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -1,8 +1,7 @@
-// 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.
 
-#include "app/app_switches.h"
 #include "app/gfx/gl/gl_implementation.h"
 #include "base/at_exit.h"
 #include "base/basictypes.h"
@@ -32,6 +31,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h"
 #include "ui/gfx/gfx_module.h"
+#include "ui/gfx/gl/gl_switches.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/window_open_disposition.h"
 #include "webkit/extensions/v8/gc_extension.h"