diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-08 21:58:04 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-08 21:58:04 +0000 |
| commit | 85aed525ca4109b6d3f9fe82d0b82c3a6d2cf722 (patch) | |
| tree | 78f12ef87462b62f1fd11a7116d1a771b9ca2e90 /chrome/browser/browser_main.cc | |
| parent | b11c6a558fe2e45617ed715fb98ed7d1ea2e9126 (diff) | |
| download | chromium_src-85aed525ca4109b6d3f9fe82d0b82c3a6d2cf722.zip chromium_src-85aed525ca4109b6d3f9fe82d0b82c3a6d2cf722.tar.gz chromium_src-85aed525ca4109b6d3f9fe82d0b82c3a6d2cf722.tar.bz2 | |
Remove net_resources.rc and net_resources.h and replace it
with a grd file that generates the same thing. We want to do
this so on linux, we will have grit generate the .h file and
a platform specific resource file.
There's some munging going on to be able to get the
effective_tld_names_clean.dat file included in the rc.
This works in visual studio and scons. I need to update
chrome_kjs.sln and the webkit*.sln files and the mac build before committing.
Review URL: http://codereview.chromium.org/16565
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index d9c3e02..cae10ad 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -73,7 +73,6 @@ #include "chrome/installer/util/version.h" #include "chrome/views/accelerator_handler.h" #include "net/base/net_module.h" -#include "net/base/net_resources.h" #include "net/base/net_util.h" #include "net/base/sdch_manager.h" #include "net/base/winsock_init.h" @@ -81,6 +80,7 @@ #include "chromium_strings.h" #include "generated_resources.h" +#include "net_resources.h" namespace { |