From f90f5c51896294e5d0bb9c891fbc60a76f88fd48 Mon Sep 17 00:00:00 2001 From: "tc@google.com" 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/safe_browsing/safe_browsing_blocking_page.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'chrome/browser/safe_browsing') diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index 712aeb4..7cf8171 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -7,7 +7,6 @@ #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h" #include "base/string_util.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/dom_operation_notification_details.h" #include "chrome/browser/dom_ui/new_tab_ui.h" @@ -20,12 +19,11 @@ #include "chrome/common/jstemplate_builder.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" -#include "generated_resources.h" +#include "grit/browser_resources.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" #include "net/base/escape.h" -// Generated by GRIT -#include "browser_resources.h" - // For malware interstitial pages, we link the problematic URL to Google's // diagnostic page. #if defined(GOOGLE_CHROME_BUILD) -- cgit v1.1