diff options
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/browser_main.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/debugger/debugger_disabled.vsprops | 2 |
2 files changed, 2 insertions, 2 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 { diff --git a/chrome/browser/debugger/debugger_disabled.vsprops b/chrome/browser/debugger/debugger_disabled.vsprops index fd949c3..2d955b4 100644 --- a/chrome/browser/debugger/debugger_disabled.vsprops +++ b/chrome/browser/debugger/debugger_disabled.vsprops @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="8.00" Name="debugger_disabled" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\breakpad\using_breakpad.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)\tools\build\win\using_generated_strings.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)\tools\build\win\debugger_disabled.vsprops;$(SolutionDir)third_party\wtl\using_wtl.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\breakpad\using_breakpad.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)\tools\build\win\debugger_disabled.vsprops;$(SolutionDir)third_party\wtl\using_wtl.vsprops" > <Tool Name="VCCLCompilerTool" |