7 files changed, 82 insertions, 27 deletions
diff --git a/app/DEPS b/app/DEPS
index 5ad4cd1..a087ecf 100644
--- a/app/DEPS
+++ b/app/DEPS
@@ -6,11 +6,6 @@ include_rules = [
   # TODO(beng): Sever these links once we have extracted all deps from
   # chrome/common.
   "+chrome/common/chrome_paths.h",
-  "+chrome/common/chrome_switches.h",
-  "+chrome/common/gtk_util.h",
-
-  # TODO(beng): l10n_util_unittest.cc:
-  "+chrome/test/data/resource.h",  
 
   "+skia",
 ]
diff --git a/app/app.vcproj b/app/app.vcproj
index cc618af..37a051d 100644
--- a/app/app.vcproj
+++ b/app/app.vcproj
@@ -145,14 +145,14 @@
 				>
 			</File>
 			<File
-				RelativePath=".\gfx\color_utils.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\gfx\color_utils.h"
-				>
-			</File>
-			<File
+				RelativePath=".\gfx\color_utils.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\gfx\color_utils.h"
+				>
+			</File>
+			<File
 				RelativePath=".\gfx\favicon_size.h"
 				>
 			</File>
@@ -176,14 +176,14 @@
 				RelativePath=".\gfx\path_win.cc"
 				>
 			</File>
-			<File
-				RelativePath=".\gfx\text_elider.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\gfx\text_elider.h"
-				>
-			</File>
+			<File
+				RelativePath=".\gfx\text_elider.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\gfx\text_elider.h"
+				>
+			</File>
 		</Filter>
 		<File
 			RelativePath=".\animation.cc"
@@ -194,6 +194,14 @@
 			>
 		</File>
 		<File
+			RelativePath=".\app_switches.cc"
+			>
+		</File>
+		<File
+			RelativePath=".\app_switches.h"
+			>
+		</File>
+		<File
 			RelativePath=".\drag_drop_types.cc"
 			>
 		</File>
@@ -222,11 +230,11 @@
 			>
 		</File>
 		<File
-			RelativePath=".\os_exchange_data_win.cc"
+			RelativePath=".\os_exchange_data.h"
 			>
 		</File>
 		<File
-			RelativePath=".\os_exchange_data.h"
+			RelativePath=".\os_exchange_data_win.cc"
 			>
 		</File>
 		<File
diff --git a/app/app_switches.cc b/app/app_switches.cc
new file mode 100644
index 0000000..f07fa32e6
--- /dev/null
+++ b/app/app_switches.cc
@@ -0,0 +1,13 @@
+// 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 {
+
+// 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";
+
+}  // namespace switches
diff --git a/app/app_switches.h b/app/app_switches.h
new file mode 100644
index 0000000..72038b9
--- /dev/null
+++ b/app/app_switches.h
@@ -0,0 +1,16 @@
+// 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.
+
+// Defines all the command-line switches used by app.
+
+#ifndef APP_APP_SWITCHES_H_
+#define APP_APP_SWITCHES_H_
+
+namespace switches {
+
+extern const wchar_t kLang[];
+
+}  // namespace switches
+
+#endif  // #ifndef APP_APP_SWITCHES_H_
diff --git a/app/l10n_util.cc b/app/l10n_util.cc
index 285b8ab..adbef03 100644
--- a/app/l10n_util.cc
+++ b/app/l10n_util.cc
@@ -6,6 +6,7 @@
 
 #include "app/l10n_util.h"
 
+#include "app/app_switches.h"
 #include "app/gfx/chrome_canvas.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
@@ -17,7 +18,6 @@
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_switches.h"
 #include "unicode/uscript.h"
 
 // TODO(playmobil): remove this undef once SkPostConfig.h is fixed.
diff --git a/app/l10n_util_unittest.cc b/app/l10n_util_unittest.cc
index 0ca5608..b1f8c93 100644
--- a/app/l10n_util_unittest.cc
+++ b/app/l10n_util_unittest.cc
@@ -5,6 +5,9 @@
 #include "build/build_config.h"
 
 #include "app/l10n_util.h"
+#if !defined(OS_MACOSX)
+#include "app/test/data/resource.h"
+#endif
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ -14,9 +17,6 @@
 #include "base/win_util.h"
 #endif
 #include "chrome/common/chrome_paths.h"
-#if !defined(OS_MACOSX)
-#include "chrome/test/data/resource.h"
-#endif
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "unicode/locid.h"
diff --git a/app/test/data/resource.h b/app/test/data/resource.h
new file mode 100644
index 0000000..7008da4
--- /dev/null
+++ b/app/test/data/resource.h
@@ -0,0 +1,23 @@
+//{{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