summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-15 01:25:29 +0000
committerbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-15 01:25:29 +0000
commit3184cba4196ffe82c2352e46136372420bdaf36c (patch)
tree36a7edb8a34768d06661fb10164497833bfea4dd /chrome/test
parentd8fd513cd610568904212fa0d2a0de523d85a2ff (diff)
downloadchromium_src-3184cba4196ffe82c2352e46136372420bdaf36c.zip
chromium_src-3184cba4196ffe82c2352e46136372420bdaf36c.tar.gz
chromium_src-3184cba4196ffe82c2352e46136372420bdaf36c.tar.bz2
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
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/automation/automation_proxy_uitest.cc1
-rw-r--r--chrome/test/data/resource.h23
-rw-r--r--chrome/test/data/resource.rc2
3 files changed, 2 insertions, 24 deletions
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
/////////////////////////////////////////////////////////////////////////////