diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-18 19:10:58 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-18 19:10:58 +0000 |
| commit | f90f5c51896294e5d0bb9c891fbc60a76f88fd48 (patch) | |
| tree | ce4526dc2d21c927f89b62bc33e0177f48bdc934 /chrome/browser/search_engines | |
| parent | 47d054af93ac917522c4a432ab3388008d5d21c6 (diff) | |
| download | chromium_src-f90f5c51896294e5d0bb9c891fbc60a76f88fd48.zip chromium_src-f90f5c51896294e5d0bb9c891fbc60a76f88fd48.tar.gz chromium_src-f90f5c51896294e5d0bb9c891fbc60a76f88fd48.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/search_engines')
| -rw-r--r-- | chrome/browser/search_engines/template_url_model.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/search_engines/template_url_model.cc b/chrome/browser/search_engines/template_url_model.cc index bfb9d43..c1a4415 100644 --- a/chrome/browser/search_engines/template_url_model.cc +++ b/chrome/browser/search_engines/template_url_model.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/string_util.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google_url_tracker.h" #include "chrome/browser/history/history.h" @@ -23,6 +22,7 @@ #include "chrome/common/stl_util-inl.h" #include "googleurl/src/gurl.h" #include "googleurl/src/url_parse.h" +#include "grit/locale_settings.h" #include "net/base/net_util.h" #include "unicode/rbbi.h" #include "unicode/uchar.h" |