summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_about_handler.cc
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-18 19:10:58 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-18 19:10:58 +0000
commitf90f5c51896294e5d0bb9c891fbc60a76f88fd48 (patch)
treece4526dc2d21c927f89b62bc33e0177f48bdc934 /chrome/browser/browser_about_handler.cc
parent47d054af93ac917522c4a432ab3388008d5d21c6 (diff)
downloadchromium_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/browser_about_handler.cc')
-rw-r--r--chrome/browser/browser_about_handler.cc10
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index d92c15f..7f4c10d 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -14,7 +14,6 @@
#include "base/string_util.h"
#include "base/thread.h"
#include "base/tracked_objects.h"
-#include "chrome/app/locales/locale_settings.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
@@ -30,6 +29,10 @@
#include "chrome/common/resource_bundle.h"
#include "chrome/renderer/about_handler.h"
#include "googleurl/src/gurl.h"
+#include "grit/browser_resources.h"
+#include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
+#include "grit/locale_settings.h"
#include "webkit/glue/webkit_glue.h"
#ifdef CHROME_V8
#include "v8/include/v8.h"
@@ -40,11 +43,6 @@
#include "chrome/browser/views/about_network_dialog.h"
#endif
-// Generated by GRIT
-#include "browser_resources.h"
-#include "chromium_strings.h"
-#include "generated_resources.h"
-
// The URL scheme used for the about ui.
static const char kAboutScheme[] = "about";