Create app_switches and remove a dep.

Move resource.h to app.

http://crbug.com/11387

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

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

11 files changed, 9 insertions, 30 deletions

diff --git a/chrome/browser/first_run.cc b/chrome/browser/first_run.cc
index d00ee47..7dbb3df 100644
--- a/chrome/browser/first_run.cc
+++ b/chrome/browser/first_run.cc
@@ -11,6 +11,7 @@
 
 #include <sstream>
 
+#include "app/app_switches.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
diff --git a/chrome/browser/plugin_process_host.cc b/chrome/browser/plugin_process_host.cc
index 36d01c6..fc2f383 100644
--- a/chrome/browser/plugin_process_host.cc
+++ b/chrome/browser/plugin_process_host.cc
@@ -12,6 +12,7 @@
 
 #include <vector>
 
+#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/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index b5f9b4b..6ae9d1b 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -11,6 +11,7 @@
 
 #include <algorithm>
 
+#include "app/app_switches.h"
 #if defined(OS_WIN)
 #include "app/win_util.h"
 #endif
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index db5ff38..0ca6e3a 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -174,6 +174,8 @@
         # All .cc, .h, and .mm files under app/ except for tests.
         '../app/animation.cc',
         '../app/animation.h',
+        '../app/app_switches.h',
+        '../app/app_switches.cc',
         '../app/drag_drop_types.cc',
         '../app/drag_drop_types.h',
         '../app/gfx/chrome_canvas.cc',
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 680e479..018a6a6 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -145,10 +145,6 @@ const wchar_t kJavaScriptFlags[]               = L"js-flags";
 // string value, the 2 letter code from ISO 3166-1.
 const wchar_t kCountry[]                       = L"country";
 
-// The language file that we want to try to open.  Of the form
-// language[-country] where language is the 2 letter code from ISO-639.
-const wchar_t kLang[]                          = L"lang";
-
 // Will add kDebugOnStart to every child processes. If a value is passed, it
 // will be used as a filter to determine if the child process should have the
 // kDebugOnStart flag passed on or not.
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index eca5247..f987cb2 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -48,7 +48,6 @@ extern const wchar_t kPluginPath[];
 extern const wchar_t kUserAgent[];
 extern const wchar_t kJavaScriptFlags[];
 extern const wchar_t kCountry[];
-extern const wchar_t kLang[];
 extern const wchar_t kDebugChildren[];
 extern const wchar_t kWaitForDebuggerChildren[];
 
diff --git a/chrome/common/common_glue.cc b/chrome/common/common_glue.cc
index 00e9817..7ca0bf8 100644
--- a/chrome/common/common_glue.cc
+++ b/chrome/common/common_glue.cc
@@ -2,6 +2,7 @@
 // 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/l10n_util.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
diff --git a/chrome/common/pref_service_unittest.cc b/chrome/common/pref_service_unittest.cc
index a7e75e0..1c017a2 100644
--- a/chrome/common/pref_service_unittest.cc
+++ b/chrome/common/pref_service_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "app/test/data/resource.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
@@ -10,7 +11,6 @@
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/test/data/resource.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class PrefServiceTest : public testing::Test {
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index 7d62a76..a18ca85 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -4,6 +4,7 @@
 
 #include <string>
 
+#include "app/app_switches.h"
 #include "app/message_box_flags.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
diff --git a/chrome/test/data/resource.h b/chrome/test/data/resource.h
deleted file mode 100644
index 7008da4..0000000
--- a/chrome/test/data/resource.h
+++ /dev/null
@@ -1,23 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by resource.rc
-//
-#define IDS_SIMPLE                      101
-#define IDS_PLACEHOLDERS                102
-#define IDS_PLACEHOLDERS_2              103
-#define IDS_PLACEHOLDERS_3              104
-
-#define IDS_LOCALE_BOOL                 105
-#define IDS_LOCALE_INT                  106
-#define IDS_LOCALE_STRING               107
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        108
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/chrome/test/data/resource.rc b/chrome/test/data/resource.rc
index 767b9db..bdf6492 100644
--- a/chrome/test/data/resource.rc
+++ b/chrome/test/data/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "app/test/data/resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////