Add locale_settings.grd to the build. This generates

a locale_settings.h file that we use on all platforms.  However,
the rc generation isn't correct yet, so for now, use the existing
locale_settings_*.rc files.

Also go ahead and generate the en-US locale pak on linux.

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

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

6 files changed, 17 insertions, 20 deletions

diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
index c73b858..ac20ed1 100644
--- a/chrome/browser/views/options/advanced_contents_view.cc
+++ b/chrome/browser/views/options/advanced_contents_view.cc
@@ -15,7 +15,6 @@
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/gfx/native_theme.h"
-#include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
@@ -39,11 +38,11 @@
 #include "chrome/views/combo_box.h"
 #include "chrome/views/grid_layout.h"
 #include "chrome/views/scroll_view.h"
+#include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
+#include "grit/locale_settings.h"
 #include "net/base/ssl_config_service.h"
 
-#include "chromium_strings.h"
-#include "generated_resources.h"
-
 using views::GridLayout;
 using views::ColumnSet;
 
diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc
index f33f104..19825ef 100644
--- a/chrome/browser/views/options/cookies_view.cc
+++ b/chrome/browser/views/options/cookies_view.cc
@@ -8,8 +8,6 @@
 
 #include "base/string_util.h"
 #include "base/time_format.h"
-#include "chrome/app/locales/locale_settings.h"
-#include "grit/theme_resources.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/gfx/color_utils.h"
@@ -21,7 +19,9 @@
 #include "chrome/views/label.h"
 #include "chrome/views/text_field.h"
 #include "chrome/views/table_view.h"
-#include "generated_resources.h"
+#include "grit/generated_resources.h"
+#include "grit/locale_settings.h"
+#include "grit/theme_resources.h"
 #include "net/base/cookie_monster.h"
 #include "net/url_request/url_request_context.h"
 
diff --git a/chrome/browser/views/options/fonts_languages_window_view.cc b/chrome/browser/views/options/fonts_languages_window_view.cc
index 950d104..3939b25 100644
--- a/chrome/browser/views/options/fonts_languages_window_view.cc
+++ b/chrome/browser/views/options/fonts_languages_window_view.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/views/options/fonts_languages_window_view.h"
 
-#include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/options/fonts_page_view.h"
 #include "chrome/browser/views/options/languages_page_view.h"
@@ -14,9 +13,9 @@
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/window.h"
-
-#include "chromium_strings.h"
-#include "generated_resources.h"
+#include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
+#include "grit/locale_settings.h"
 
 // static
 static FontsLanguagesWindowView* instance_ = NULL;
diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc
index 3f41bbd..c39b464 100644
--- a/chrome/browser/views/options/fonts_page_view.cc
+++ b/chrome/browser/views/options/fonts_page_view.cc
@@ -11,8 +11,6 @@
 #include "base/file_util.h"
 #include "base/gfx/native_theme.h"
 #include "base/string_util.h"
-#include "grit/theme_resources.h"
-#include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/shell_dialogs.h"
@@ -30,7 +28,9 @@
 #include "chrome/views/radio_button.h"
 #include "chrome/views/text_field.h"
 #include "chrome/views/widget.h"
-#include "generated_resources.h"
+#include "grit/generated_resources.h"
+#include "grit/theme_resources.h"
+#include "grit/locale_settings.h"
 #include "skia/include/SkBitmap.h"
 
 class DefaultEncodingComboboxModel : public views::ComboBox::Model {
diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc
index 9ff07f5..80ed294 100644
--- a/chrome/browser/views/options/options_group_view.cc
+++ b/chrome/browser/views/options/options_group_view.cc
@@ -8,7 +8,6 @@
 #include "chrome/browser/views/options/options_group_view.h"
 
 #include "base/gfx/native_theme.h"
-#include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/gfx/chrome_canvas.h"
@@ -17,7 +16,8 @@
 #include "chrome/views/grid_layout.h"
 #include "chrome/views/label.h"
 #include "chrome/views/separator.h"
-#include "generated_resources.h"
+#include "grit/locale_settings.h"
+#include "grit/generated_resources.h"
 
 static const int kLeftColumnWidthChars = 20;
 static const int kOptionsGroupViewColumnSpacing = 30;
diff --git a/chrome/browser/views/options/options_window_view.cc b/chrome/browser/views/options/options_window_view.cc
index 5b23707..fbe4003 100644
--- a/chrome/browser/views/options/options_window_view.cc
+++ b/chrome/browser/views/options/options_window_view.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/options_window.h"
 
-#include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/options/advanced_page_view.h"
@@ -22,9 +21,9 @@
 #include "chrome/views/tabbed_pane.h"
 #include "chrome/views/root_view.h"
 #include "chrome/views/window.h"
-
-#include "chromium_strings.h"
-#include "generated_resources.h"
+#include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
+#include "grit/locale_settings.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // OptionsWindowView