From f90f5c51896294e5d0bb9c891fbc60a76f88fd48 Mon Sep 17 00:00:00 2001
From: "tc@google.com" <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 18 Feb 2009 19:10:58 +0000
Subject: 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
---
 chrome/browser/tab_contents/web_contents.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'chrome/browser/tab_contents/web_contents.cc')

diff --git a/chrome/browser/tab_contents/web_contents.cc b/chrome/browser/tab_contents/web_contents.cc
index 7f6cc79..c1c0fd9 100644
--- a/chrome/browser/tab_contents/web_contents.cc
+++ b/chrome/browser/tab_contents/web_contents.cc
@@ -9,7 +9,6 @@
 #include "base/file_version_info.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
-#include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/autofill_manager.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
@@ -34,6 +33,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/render_messages.h"
+#include "grit/locale_settings.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/registry_controlled_domain.h"
@@ -55,7 +55,7 @@
 #include "chrome/common/resource_bundle.h"
 #endif
 
-#include "generated_resources.h"
+#include "grit/generated_resources.h"
 
 #if !defined(OS_MACOSX)
 // TODO(port): port this to mac.
-- 
cgit v1.1